diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index 00226d18b779..991726081c06 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-#	$NetBSD: IPAQ,v 1.5 2001/07/02 13:52:29 ichiro Exp $
+#	$NetBSD: IPAQ,v 1.6 2001/07/07 07:04:56 ichiro Exp $
 #
 #	iPAQ H3600 -- Windows-CE based PDA
 #
@@ -14,16 +14,16 @@ options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 #options 	NTP		# NTP phase/frequency locked loop
 
 # CPU options
-
 options 	CPU_SA110	# Support the SA110 core
 options 	CPU_SA1110	# Support the SA110 core
 
 # Architecture options
 options 	HPCARM		# Windows-CE based
 options 	SAIP		# We use SA1110 builtin peripherals
+options		SAEGPIO_BASE="0x41000000"
+				# we have Extended GPIO
 
 # FPA options
-
 #options 	ARMFPE		# ARM Ltd FPE
 
 # File systems
diff --git a/sys/arch/hpcarm/sa11x0/sa11x0.c b/sys/arch/hpcarm/sa11x0/sa11x0.c
index 6abb57e1a07b..6c4c9076b0e9 100644
--- a/sys/arch/hpcarm/sa11x0/sa11x0.c
+++ b/sys/arch/hpcarm/sa11x0/sa11x0.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0.c,v 1.13 2001/06/29 17:22:51 toshii Exp $	*/
+/*	$NetBSD: sa11x0.c,v 1.14 2001/07/07 07:04:56 ichiro Exp $	*/
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -144,12 +144,18 @@ sa11x0_attach(parent, self, aux)
 		panic("%s: Cannot map registers\n", self->dv_xname);
 	saipic_base = sc->sc_ioh;
 
-	/* Map the GPIO registers */
+	/* Map the GPIO and Extended GPIO registers */
 	if (bus_space_map(sc->sc_iot, SAGPIO_BASE, SAGPIO_NPORTS,
 			  0, &sc->sc_gpioh))
 		panic("%s: unable to map GPIO registers\n", self->dv_xname);
 	bus_space_write_4(sc->sc_iot, sc->sc_gpioh, SAGPIO_EDR, 0xffffffff);
 
+#ifdef SAEGPIO_BASE
+	if (bus_space_map(sc->sc_iot, SAEGPIO_BASE, 1, 0, &sc->sc_egpioh))
+		panic("%s: unable to map Extended GPIO registers\n",
+			self->dv_xname);
+#endif
+
 	/* Map the PPC registers */
 	if (bus_space_map(sc->sc_iot, SAPPC_BASE, SAPPC_NPORTS,
 			  0, &sc->sc_ppch))
diff --git a/sys/arch/hpcarm/sa11x0/sa11x0_var.h b/sys/arch/hpcarm/sa11x0/sa11x0_var.h
index db88a030461c..2cda26c4571d 100644
--- a/sys/arch/hpcarm/sa11x0/sa11x0_var.h
+++ b/sys/arch/hpcarm/sa11x0/sa11x0_var.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: sa11x0_var.h,v 1.6 2001/06/20 02:19:55 toshii Exp $        */
+/*      $NetBSD: sa11x0_var.h,v 1.7 2001/07/07 07:04:56 ichiro Exp $        */
 
 /*-
  * Copyright (c) 2001, The NetBSD Foundation, Inc.  All rights reserved.
@@ -46,6 +46,7 @@ struct sa11x0_softc {
 	bus_space_tag_t sc_iot;
 	bus_space_handle_t sc_ioh;
 	bus_space_handle_t sc_gpioh;
+	bus_space_handle_t sc_egpioh;
 	bus_space_handle_t sc_ppch;
 	bus_space_handle_t sc_dmach;
 	u_int32_t sc_intrmask;