diff --git a/templates/kernel/i386-dotconfig b/templates/kernel/i386-dotconfig
index 890d1809f77..213f1482f85 100644
--- a/templates/kernel/i386-dotconfig
+++ b/templates/kernel/i386-dotconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31.1
-# Sat Sep 26 04:42:51 2009
+# Linux kernel version: 2.6.31.6
+# Fri Nov 13 02:05:40 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -24,6 +24,7 @@ CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_GPIO=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -87,9 +88,10 @@ CONFIG_AUDIT_TREE=y
 #
 # RCU Subsystem
 #
-CONFIG_CLASSIC_RCU=y
+# CONFIG_CLASSIC_RCU is not set
 # CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_TRACE is not set
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_PREEMPT_RCU_TRACE is not set
 CONFIG_IKCONFIG=y
@@ -332,7 +334,7 @@ CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-# CONFIG_HIGHPTE is not set
+CONFIG_HIGHPTE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW_64K=y
@@ -377,10 +379,10 @@ CONFIG_HIBERNATION=y
 CONFIG_PM_STD_PARTITION=""
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
 CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
+# CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
 CONFIG_ACPI_BUTTON=m
@@ -463,7 +465,6 @@ CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_DMAR=y
 # CONFIG_DMAR_DEFAULT_ON is not set
@@ -474,10 +475,11 @@ CONFIG_HOTPLUG_PCI_PCIE=m
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
 # CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
@@ -487,7 +489,7 @@ CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_MCA is not set
 # CONFIG_SCx200 is not set
-CONFIG_OLPC=y
+# CONFIG_OLPC is not set
 CONFIG_K8_NB=y
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
@@ -577,10 +579,27 @@ CONFIG_INET_XFRM_MODE_BEET=m
 CONFIG_INET_LRO=y
 CONFIG_INET_DIAG=y
 CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=y
+# CONFIG_DEFAULT_BIC is not set
+# CONFIG_DEFAULT_CUBIC is not set
+# CONFIG_DEFAULT_HTCP is not set
+# CONFIG_DEFAULT_VEGAS is not set
+# CONFIG_DEFAULT_WESTWOOD is not set
+CONFIG_DEFAULT_RENO=y
+CONFIG_DEFAULT_TCP_CONG="reno"
+CONFIG_TCP_MD5SIG=y
 CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
@@ -678,7 +697,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
+# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=m
@@ -983,9 +1002,9 @@ CONFIG_BT_SCO=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
 CONFIG_BT_HIDP=m
 
 #
@@ -1013,7 +1032,7 @@ CONFIG_WIRELESS=y
 CONFIG_CFG80211=m
 # CONFIG_CFG80211_REG_DEBUG is not set
 # CONFIG_CFG80211_DEBUGFS is not set
-CONFIG_WIRELESS_OLD_REGULATORY=y
+# CONFIG_WIRELESS_OLD_REGULATORY is not set
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
@@ -1063,7 +1082,7 @@ CONFIG_EXTRA_FIRMWARE=""
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_CONCAT=m
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_TESTS=m
 # CONFIG_MTD_REDBOOT_PARTS is not set
@@ -1238,7 +1257,7 @@ CONFIG_IDE_PROC_FS=y
 CONFIG_IDE_GENERIC=m
 CONFIG_BLK_DEV_PLATFORM=m
 CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_CMD640_ENHANCED=y
 CONFIG_BLK_DEV_IDEPNP=m
 CONFIG_BLK_DEV_IDEDMA_SFF=y
 
@@ -1386,7 +1405,7 @@ CONFIG_FCOE_FNIC=m
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_DTC3280=m
 CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 # CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
 CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_FUTURE_DOMAIN=m
@@ -1423,8 +1442,8 @@ CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_T128=m
 CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
+CONFIG_SCSI_U14_34F_TAGGED_QUEUE=y
+CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
 CONFIG_SCSI_U14_34F_MAX_TAGS=8
 CONFIG_SCSI_ULTRASTOR=m
 CONFIG_SCSI_NSP32=m
@@ -1484,7 +1503,7 @@ CONFIG_PATA_HPT366=m
 CONFIG_PATA_HPT37X=m
 CONFIG_PATA_HPT3X2N=m
 CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_HPT3X3_DMA=y
 CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT821X=m
 CONFIG_PATA_IT8213=m
@@ -1571,7 +1590,7 @@ CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
 CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
+# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
 CONFIG_I2O_BUS=m
 CONFIG_I2O_BLOCK=m
 CONFIG_I2O_SCSI=m
@@ -2037,7 +2056,6 @@ CONFIG_HISAX_MAX_CARDS=8
 #
 CONFIG_HISAX_16_0=y
 CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
 CONFIG_HISAX_S0BOX=y
 CONFIG_HISAX_AVM_A1=y
 CONFIG_HISAX_FRITZPCI=y
@@ -2051,18 +2069,11 @@ CONFIG_HISAX_HFCS=y
 CONFIG_HISAX_SEDLBAUER=y
 CONFIG_HISAX_SPORTSTER=y
 CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
 CONFIG_HISAX_NICCY=y
 CONFIG_HISAX_ISURF=y
 CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
 CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
 CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
 # CONFIG_HISAX_DEBUG is not set
 
 #
@@ -2079,7 +2090,6 @@ CONFIG_HISAX_TELES_CS=m
 CONFIG_HISAX_ST5481=m
 CONFIG_HISAX_HFCUSB=m
 CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
 CONFIG_HISAX_HDLC=y
 
 #
@@ -2150,6 +2160,8 @@ CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
@@ -2164,7 +2176,6 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_MOUSE_SERIAL=y
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -2173,6 +2184,7 @@ CONFIG_MOUSE_INPORT=m
 CONFIG_MOUSE_LOGIBM=m
 CONFIG_MOUSE_PC110PAD=m
 CONFIG_MOUSE_VSXXXAA=m
+# CONFIG_MOUSE_GPIO is not set
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_ANALOG=m
@@ -2228,9 +2240,9 @@ CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -2259,6 +2271,7 @@ CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_PCF50633_PMU=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
 
 #
 # Hardware I/O ports
@@ -2301,8 +2314,6 @@ CONFIG_SYNCLINKMP=m
 CONFIG_N_HDLC=m
 # CONFIG_RISCOM8 is not set
 # CONFIG_SPECIALIX is not set
-# CONFIG_SX is not set
-# CONFIG_RIO is not set
 # CONFIG_STALDRV is not set
 CONFIG_NOZOMI=m
 
@@ -2408,6 +2419,7 @@ CONFIG_I2C_VIAPRO=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+# CONFIG_I2C_GPIO is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_SIMTEC=m
 
@@ -2436,9 +2448,6 @@ CONFIG_SCx200_ACB=m
 # Miscellaneous I2C Chip support
 #
 CONFIG_DS1682=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_PCF8575=m
-CONFIG_SENSORS_PCA9539=m
 CONFIG_SENSORS_TSL2550=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
@@ -2453,6 +2462,7 @@ CONFIG_SPI_MASTER=y
 #
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
+# CONFIG_SPI_GPIO is not set
 CONFIG_SPI_LM70_LLP=m
 
 #
@@ -2467,7 +2477,30 @@ CONFIG_SPI_TLE62X0=m
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_GPIOLIB is not set
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MCP23S08=m
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -2477,6 +2510,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_GPIO=m
 
 #
 # 1-wire Slaves
@@ -2485,7 +2519,7 @@ CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
@@ -2494,7 +2528,6 @@ CONFIG_PDA_POWER=m
 CONFIG_WM8350_POWER=m
 CONFIG_BATTERY_DS2760=m
 CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_OLPC=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_MAX17040=m
 CONFIG_CHARGER_PCF50633=m
@@ -2555,6 +2588,7 @@ CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+# CONFIG_SENSORS_SHT15 is not set
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_SMSC47M1=m
@@ -2658,7 +2692,10 @@ CONFIG_SSB_DRIVER_PCICORE=y
 #
 CONFIG_MFD_CORE=m
 CONFIG_MFD_SM501=m
+# CONFIG_MFD_SM501_GPIO is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_UCB1400_CORE is not set
+# CONFIG_TPS65010 is not set
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 CONFIG_MFD_WM8350=m
@@ -2668,7 +2705,17 @@ CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_AB3100_CORE=m
 # CONFIG_EZX_PCAP is not set
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_BQ24022=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_LP3971=m
 CONFIG_MEDIA_SUPPORT=m
 
 #
@@ -3089,6 +3136,7 @@ CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 CONFIG_AGP_EFFICEON=m
 CONFIG_DRM=m
+CONFIG_DRM_TTM=m
 CONFIG_DRM_TDFX=m
 CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
@@ -3484,8 +3532,8 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_SUSPEND=y
 # CONFIG_USB_OTG is not set
@@ -3502,7 +3550,7 @@ CONFIG_USB_XHCI_HCD=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_USB_EHCI_HCD=m
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
-# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_OXU210HP_HCD=m
 CONFIG_USB_ISP116X_HCD=m
 CONFIG_USB_ISP1760_HCD=m
@@ -3693,6 +3741,7 @@ CONFIG_USB_G_PRINTER=m
 # OTG and related infrastructure
 #
 CONFIG_USB_OTG_UTILS=y
+# CONFIG_USB_GPIO_VBUS is not set
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_UWB=m
 CONFIG_UWB_HWA=m
@@ -3744,8 +3793,10 @@ CONFIG_LEDS_CLASS=m
 #
 # LED drivers
 #
-# CONFIG_LEDS_ALIX2 is not set
+CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_PCA955X=m
@@ -3761,6 +3812,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_GPIO is not set
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 
 #
@@ -3902,7 +3954,7 @@ CONFIG_ME8200=m
 CONFIG_MEDUMMY=m
 CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_IP_VHCI_HCD=m
 CONFIG_USB_IP_HOST=m
@@ -3964,7 +4016,7 @@ CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
+CONFIG_SONYPI_COMPAT=y
 CONFIG_THINKPAD_ACPI=m
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
@@ -4088,7 +4140,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
+# CONFIG_NTFS_RW is not set
 
 #
 # Pseudo filesystems
@@ -4108,7 +4160,7 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_AFFS_FS=m
 CONFIG_ECRYPT_FS=m
 CONFIG_UNION_FS=m
-# CONFIG_UNION_FS_XATTR is not set
+CONFIG_UNION_FS_XATTR=y
 # CONFIG_UNION_FS_DEBUG is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
@@ -4310,7 +4362,6 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_FRAME_POINTER is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_FAULT_INJECTION is not set
@@ -4392,18 +4443,18 @@ CONFIG_CRYPTO=y
 # Crypto core or helper
 #
 CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_ALGAPI=m
+CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_BLKCIPHER=m
 CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=m
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER=m
 CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=m
@@ -4442,7 +4493,7 @@ CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
diff --git a/templates/kernel/template b/templates/kernel/template
index f4f54c79b34..74e79cbdf0e 100644
--- a/templates/kernel/template
+++ b/templates/kernel/template
@@ -1,14 +1,14 @@
 # Template file for 'kernel'
 pkgname=kernel
 _kernel_ver=2.6.31
-_kernel_patch_ver=5
+_kernel_patch_ver=6
 version=${_kernel_ver}.${_kernel_patch_ver}
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
 build_style=custom-install
 short_desc="The Linux kernel and associated stuff (2.6 branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=3988b645a9350267de5768cc8f41c966c26d8ebfffb31519bf6c8874258603bb
+checksum=7751de380eab755a647c7137949bc6207fd14379e5e8e5c15c421fdc8390c45e
 long_desc="
  This package provides the linux kernel image and associated modules."
 
@@ -29,7 +29,7 @@ do_install()
 {
 	# If there's a file called kernel-<arch>-dotconfig, use it to
 	# configure the kernel; otherwise run the menuconfig target.
-	local arch lver mjobs
+	local arch lver mjobs hdrdest
 
 	if [ "$XBPS_MAKEJOBS" -gt 1 ]; then
 		mjobs="-j $XBPS_MAKEJOBS"
@@ -67,6 +67,9 @@ do_install()
 	else
 		lver="${version}"
 	fi
+
+	hdrdest=${DESTDIR}/usr/src/kernel-headers-${lver}
+
 	install -m 644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-${lver}
 	install -m 644 System.map ${DESTDIR}/boot/System.map-${lver}
 	install -m 644 .config ${DESTDIR}/boot/config-${lver}
@@ -77,116 +80,104 @@ do_install()
 
 	# Install required headers to build external modules
 	cd ${wrksrc} || return 1
-	install -D -m644 Makefile \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/Makefile
-	install -D -m644 kernel/Makefile \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/kernel/Makefile
-	install -D -m644 .config \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/.config
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+	install -D -m644 Makefile ${hdrdest}/Makefile
+	install -D -m644 kernel/Makefile ${hdrdest}/kernel/Makefile
+	install -D -m644 .config ${hdrdest}/.config
+	mkdir -p ${hdrdest}/include
 
 	for i in acpi asm-generic asm-x86 config linux math-emu media net \
 		pcmcia scsi sound trace video; do
-		cp -a include/$i ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+		cp -a include/$i ${hdrdest}/include
 	done
 
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
-	cp -a arch/x86/include ${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+	mkdir -p ${hdrdest}/arch/x86
+	cp -a arch/x86/include ${hdrdest}/arch/x86
 
 	# Copy files necessary for later builds, like nvidia and vmware
-	cp Module.symvers ${DESTDIR}/usr/src/kernel-headers-${lver}
-	cp -a scripts ${DESTDIR}/usr/src/kernel-headers-${lver}
+	cp Module.symvers ${hdrdest}
+	cp -a scripts ${hdrdest}
 
 	# Fix permissions on scripts dir
-	chmod og-w -R ${DESTDIR}/usr/src/kernel-headers-${lver}/scripts
+	chmod og-w -R ${hdrdest}/scripts
 
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86/kernel
-	cp arch/x86/Makefile \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+	mkdir -p ${hdrdest}/arch/x86/kernel
+	cp arch/x86/Makefile ${hdrdest}/arch/x86
 	if [ "$arch" = "i386" ]; then
-		cp arch/x86/Makefile_32.cpu \
-			${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+		cp arch/x86/Makefile_32.cpu ${hdrdest}/arch/x86
 	fi
-	cp arch/x86/kernel/asm-offsets.s \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86/kernel
+	cp arch/x86/kernel/asm-offsets.s ${hdrdest}/arch/x86/kernel
 
 	# Add headers for lirc package
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video
-	cp drivers/media/video/*.h  \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video
+	mkdir -p ${hdrdest}/drivers/media/video
+	cp drivers/media/video/*.h ${hdrdest}/drivers/media/video
 	for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 \
 		 sn9c102 usbvideo zc0301; do
-		mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video/$i
+		mkdir -p ${hdrdest}/drivers/media/video/$i
 		cp -a drivers/media/video/$i/*.h \
-			${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video/$i
+			${hdrdest}/drivers/media/video/$i
 	done
 
 	# Add docbook makefile
 	install -D -m644 Documentation/DocBook/Makefile \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/Documentation/DocBook/Makefile
+		${hdrdest}/Documentation/DocBook/Makefile
 
 	# Add md headers
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/md
-	cp drivers/md/*.h  \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/md
+	mkdir -p ${hdrdest}/drivers/md
+	cp drivers/md/*.h ${hdrdest}/drivers/md
 
 	# Add inotify.h
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/include/linux
-	cp include/linux/inotify.h \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/include/linux
+	mkdir -p ${hdrdest}/include/linux
+	cp include/linux/inotify.h ${hdrdest}/include/linux
 
 	# Add wireless headers
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/net/mac80211/
-	cp net/mac80211/*.h ${DESTDIR}/usr/src/kernel-headers-${lver}/net/mac80211
+	mkdir -p ${hdrdest}/net/mac80211/
+	cp net/mac80211/*.h ${hdrdest}/net/mac80211
 
 	# Add dvb headers for external modules in reference to:
 	# http://bugs.archlinux.org/task/9912
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/dvb-core
-	cp drivers/media/dvb/dvb-core/*.h \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/dvb-core
+	mkdir -p ${hdrdest}/drivers/media/dvb/dvb-core
+	cp drivers/media/dvb/dvb-core/*.h ${hdrdest}/drivers/media/dvb/dvb-core
 
 	# Add dvb headers for external modules in reference to:
 	# http://bugs.archlinux.org/task/11194
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/include/config/dvb
-	cp include/config/dvb/*.h \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/include/config/dvb
+	mkdir -p ${hdrdest}/include/config/dvb
+	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb
 
 	# Add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
 	# in reference to:
 	# http://bugs.archlinux.org/task/13146
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/frontends
+	mkdir -p ${hdrdest}/drivers/media/dvb/frontends
 	cp drivers/media/dvb/frontends/lgdt330x.h \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/frontends
+		${hdrdest}/drivers/media/dvb/frontends
 	cp drivers/media/video/msp3400-driver.h \
-		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/frontends
+		${hdrdest}/drivers/media/dvb/frontends
 
 	# Add xfs and shmem for aufs building
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/fs/xfs
-	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/mm
-	cp fs/xfs/xfs_sb.h ${DESTDIR}/usr/src/kernel-headers-${lver}/fs/xfs/xfs_sb.h
+	mkdir -p ${hdrdest}/fs/xfs
+	mkdir -p ${hdrdest}/mm
+	cp fs/xfs/xfs_sb.h ${hdrdest}/fs/xfs/xfs_sb.h
 
 	# Add headers vor virtualbox in reference to:
 	# http://bugs.archlinux.org/task/14568
-	cp -a include/drm ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+	cp -a include/drm ${hdrdest}/include
 
 	# Add headers for broadcom wl in reference to:
 	# http://bugs.archlinux.org/task/14568
-	cp -a include/trace ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+	cp -a include/trace ${hdrdest}/include
 
 	# Add vmlinux
-	cp vmlinux ${DESTDIR}/usr/src/kernel-headers-${lver}
+	cp vmlinux ${hdrdest}
 
 	# Copy in Kconfig files
 	for i in `find . -name "Kconfig*"`; do
-		mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/`echo $i | sed 's|/Kconfig.*||'`
-		cp $i ${DESTDIR}/usr/src/kernel-headers-${lver}/$i
+		mkdir -p ${hdrdest}/`echo $i | sed 's|/Kconfig.*||'`
+		cp $i ${hdrdest}/$i
 	done
-	cd ${DESTDIR}/usr/src/kernel-headers-${lver}/include && \
-		ln -s asm-x86 asm
+	cd ${hdrdest}/include && ln -s asm-x86 asm
 
 	# Remove unneeded architectures
 	for arch in alpha arm* avr32 blackfin cris frv h8300 \
 		ia64 m* p* s* um v850 xtensa; do
-		rm -rf ${DESTDIR}/usr/src/kernel-headers-${lver}/${arch}
+		rm -rf ${hdrdest}/${arch}
 	done
 }