diff --git a/architecture/hppa/gcc-options b/architecture/hppa/gcc-options
index dba8f623a..9a9e3aa79 100644
--- a/architecture/hppa/gcc-options
+++ b/architecture/hppa/gcc-options
@@ -1,5 +1,8 @@
 
-if [ "$ROCKCFG_SPARC_OPT" != "generic" ] ; then
-	var_append GCC_WRAPPER_INSERT " " "-mcpu=$ROCKCFG_SPARC_OPT"
+if [ "$ROCKCFG_HPPA_BITS" == "32" ] ; then
+	var_append GCC_WRAPPER_INSERT " " "-march=1.1"
 fi
 
+if [ "$ROCKCFG_HPPA_BITS" == "64" ] ; then
+	var_append GCC_WRAPPER_INSERT " " "-march=2.0"
+fi
diff --git a/architecture/hppa/kernel.conf.m4 b/architecture/hppa/kernel.conf.m4
index f7a637738..097abc6c9 100644
--- a/architecture/hppa/kernel.conf.m4
+++ b/architecture/hppa/kernel.conf.m4
@@ -1,7 +1,36 @@
 
-# TO BE DONE
+dnl Enable PARISC ARCH
+CONFIG_PARISC=y
+# CONFIG_UID16 is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+
+CONFIG_PA7100=y
+# CONFIG_PA7200 is not set
+# CONFIG_PA7100LC is not set
+# CONFIG_PA8X00 is not set
+CONFIG_PA11=y
+
 
 include(`kernel-common.conf')
+
+CONFIG_NR_CPUS=32
+CONFIG_CHASSIS_LCD_LED=y
+CONFIG_PDC_CHASSIS=y
+CONFIG_IOMMU_CCIO=y
+CONFIG_GSC=y
+CONFIG_GSC_LASI=y
+CONFIG_GSC_WAX=y
+CONFIG_EISA=y
+CONFIG_ISA=y
+CONFIG_PCI=y
+CONFIG_GSC_DINO=y
+CONFIG_PCI_LBA=y
+CONFIG_IOSAPIC=y
+CONFIG_IOMMU_SBA=y
+CONFIG_SUPERIO=y
+CONFIG_PCI_NAMES=y
+
 include(`kernel-scsi.conf')
 include(`kernel-net.conf')
 include(`kernel-fs.conf')