diff --git a/architecture/share/kernel-common.conf b/architecture/share/kernel-common.conf
index a4465b05f..8934b278a 100644
--- a/architecture/share/kernel-common.conf
+++ b/architecture/share/kernel-common.conf
@@ -24,6 +24,31 @@ dnl
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_INITRD=y
 
+dnl Disable deprecated options we don't need
+dnl Deprecated sysfs files
+CONFIG_SYSFS_DEPRECATED=n
+dnl Compat VDSO support
+CONFIG_COMPAT_VDSO=n
+dnl Legacy Power Management API
+CONFIG_PM_LEGACY=n
+dnl /proc/acpi/processor/../performance interface
+CONFIG_X86_ACPI_CPUFREQ_PROC_INTF=n
+dnl USB device class-devices
+CONFIG_USB_DEVICE_CLASS=n
+
+dnl Deprecated options we might still need
+dnl
+dnl CONFIG_SCSI_PROC_FS=n
+dnl CONFIG_IDE_PROC_FS=n
+
+dnl Unified userspace <-> kernelspace connector (for udevd)
+dnl
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+
+dnl RAW driver
+CONFIG_RAW_DRIVER=n
+
 dnl Enable PCMCIA (PC-Card) as modules
 dnl
 CONFIG_PCMCIA=m
@@ -51,10 +76,11 @@ CONFIG_SOUND=m
 dnl for 2.5/6 we do want the ALSA OSS emulation ...
 dnl
 CONFIG_SND_OSSEMUL=m
+CONFIG_SND_SUPPORT_OLD_API=n
 
 dnl Disable OSS modules
 dnl
-# CONFIG_SOUND_PRIME is not set
+CONFIG_SOUND_PRIME=n
 
 dnl Input devices
 dnl
diff --git a/architecture/share/kernel-net.conf b/architecture/share/kernel-net.conf
index 83bb1c611..1c53b6f2c 100644
--- a/architecture/share/kernel-net.conf
+++ b/architecture/share/kernel-net.conf
@@ -75,3 +75,16 @@ CONFIG_HISAX_AVM_A1_PCMCIA=y
 CONFIG_HISAX_ELSA=y
 CONFIG_HISAX_FRITZ_PCIPNP=m
 
+dnl Driver specific options
+dnl
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_R8169_VLAN=y
+dnl Drivers for NIC variants
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+CONFIG_CHELSIO_T1_1G=y
+
+dnl Enable WLAN drivers as modules
+dnl
+CONFIG_WLAN_PRE80211=y
+CONFIG_WLAN_80211=y
diff --git a/architecture/x86/kernel.conf.sh b/architecture/x86/kernel.conf.sh
index b2daaf6b6..5aebf1a6a 100644
--- a/architecture/x86/kernel.conf.sh
+++ b/architecture/x86/kernel.conf.sh
@@ -71,6 +71,8 @@
 		CONFIG_INPUT_JOYSTICK=y
 		CONFIG_CPU_FREQ=y
 		CONFIG_HIGHMEM4G=y
+		CONFIG_PARPORT_PC_FIFO=y
+		CONFIG_PARPORT_1284=y
 
 		include(`kernel-common.conf')
 		include(`kernel-scsi.conf')