diff --git a/srcpkgs/kernel/common-vars b/srcpkgs/kernel/common-vars
index b5c76217f3..d5984ab248 100644
--- a/srcpkgs/kernel/common-vars
+++ b/srcpkgs/kernel/common-vars
@@ -1,12 +1,13 @@
 # Common vars shared by the 'kernel' and 'kernel-libc-headers'
 # build templates.
-_kernel_ver=2.6.39
-#version=${_kernel_ver}
-_kernel_patch_ver=3
-version=${_kernel_ver}.${_kernel_patch_ver}
+version=3.0
+_kernel_ver_minor=0
 wrksrc="linux-$version"
-distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
+distfiles="${KERNEL_SITE}/kernel/v3.0/linux-${version}.tar.bz2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
-checksum=324bd8bde3929be5d9c33e262d8ca197a45e7e2587b7c5703a7004d78901a8d3
+checksum=64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
+
+# Generated kernel version is not the same than in distfile!
+_kernel_hooks_version="${version}.${_kernel_ver_minor}"
diff --git a/srcpkgs/kernel/files/x86_64-dotconfig b/srcpkgs/kernel/files/x86_64-dotconfig
index 1c11d8e346..249ece8ca6 100644
--- a/srcpkgs/kernel/files/x86_64-dotconfig
+++ b/srcpkgs/kernel/files/x86_64-dotconfig
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.39 Kernel Configuration
-# Thu May 19 08:27:57 2011
+# Linux/x86_64 3.0.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -54,7 +53,6 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 
@@ -76,6 +74,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_LZMA is not set
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
@@ -108,13 +107,15 @@ CONFIG_PREEMPT_RCU=y
 CONFIG_RCU_FANOUT=64
 # CONFIG_RCU_FANOUT_EXACT is not set
 # CONFIG_TREE_RCU_TRACE is not set
+CONFIG_RCU_BOOST=y
+CONFIG_RCU_BOOST_PRIO=1
+CONFIG_RCU_BOOST_DELAY=500
 CONFIG_IKCONFIG=m
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
@@ -154,7 +155,6 @@ CONFIG_ANON_INODES=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -360,11 +360,11 @@ CONFIG_X86_64_ACPI_NUMA=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NUMA_EMU is not set
 CONFIG_NODES_SHIFT=6
-CONFIG_ARCH_PROC_KCORE_TEXT=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -393,6 +393,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_CLEANCACHE=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_RESERVE_LOW=64
@@ -422,7 +423,6 @@ CONFIG_HOTPLUG_CPU=y
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 
 #
@@ -443,7 +443,6 @@ CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
@@ -467,6 +466,7 @@ CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_HOTPLUG_MEMORY=m
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
+CONFIG_ACPI_CUSTOM_METHOD=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=m
 CONFIG_ACPI_APEI_PCIEAER=y
@@ -479,7 +479,6 @@ CONFIG_SFI=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -493,7 +492,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
-# CPUFreq processor drivers
+# x86 CPU frequency scaling drivers
 #
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
@@ -999,6 +998,7 @@ CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -1037,6 +1037,8 @@ CONFIG_BATMAN_ADV=m
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_HAVE_BPF_JIT=y
+# CONFIG_BPF_JIT is not set
 
 #
 # Network testing
@@ -1200,6 +1202,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_REGULATOR=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 # CONFIG_NET_9P_RDMA is not set
@@ -1226,12 +1229,15 @@ CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_SYS_HYPERVISOR=y
-CONFIG_ARCH_NO_SYSDEV_OPS=y
 CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_PARTITIONS is not set
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_AR7_PARTS=m
 
 #
 # User Modules And Translation Layers
@@ -1345,6 +1351,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
@@ -1355,6 +1362,7 @@ CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 # CONFIG_IBM_ASM is not set
 CONFIG_PHANTOM=m
+CONFIG_INTEL_MID_PTI=m
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1501,6 +1509,7 @@ CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
@@ -1670,6 +1679,7 @@ CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
 CONFIG_LOOPBACK_TARGET=m
 # CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
+CONFIG_TCM_FC=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1720,7 +1730,6 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_BCM63XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -1889,12 +1898,12 @@ CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+# CONFIG_ATH9K_AHB is not set
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
@@ -1943,6 +1952,7 @@ CONFIG_IWLAGN=m
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEVICE_SVTOOL is not set
 CONFIG_IWL_P2P=y
 CONFIG_IWLWIFI_LEGACY=m
 
@@ -1990,17 +2000,18 @@ CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
 CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m
@@ -2016,6 +2027,8 @@ CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2055,6 +2068,7 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
@@ -2172,6 +2186,7 @@ CONFIG_INPUT_EVDEV=m
 #
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
@@ -2183,6 +2198,7 @@ CONFIG_KEYBOARD_TCA6416=m
 # CONFIG_KEYBOARD_LM8323 is not set
 CONFIG_KEYBOARD_MAX7359=m
 CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_NEWTON is not set
 CONFIG_KEYBOARD_OPENCORES=m
 # CONFIG_KEYBOARD_STOWAWAY is not set
@@ -2258,6 +2274,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
@@ -2363,6 +2380,8 @@ CONFIG_NOZOMI=m
 CONFIG_ISI=m
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
 CONFIG_DEVKMEM=y
 # CONFIG_STALDRV is not set
 
@@ -2397,6 +2416,7 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_IFX6X60=m
 CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@@ -2417,6 +2437,9 @@ CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
+CONFIG_RTC=m
+CONFIG_GEN_RTC=m
+# CONFIG_GEN_RTC_X is not set
 CONFIG_R3964=m
 CONFIG_APPLICOM=m
 
@@ -2557,14 +2580,24 @@ CONFIG_PPS_CLIENT_PARPORT=m
 #
 # PPS generators support
 #
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+
+#
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
+#
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_MAX730X=m
 
 #
-# Memory mapped GPIO expanders:
+# Memory mapped GPIO drivers:
 #
+CONFIG_GPIO_BASIC_MMIO_CORE=m
 CONFIG_GPIO_BASIC_MMIO=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
@@ -2615,6 +2648,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 
 #
@@ -2622,17 +2656,20 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
 CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 CONFIG_W1_SLAVE_DS2433_CRC=y
 CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
 CONFIG_TEST_POWER=m
 CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
@@ -2642,6 +2679,7 @@ CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
 CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
@@ -2668,6 +2706,7 @@ CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
@@ -2682,7 +2721,6 @@ CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_PKGTEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
@@ -2707,17 +2745,22 @@ CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
 CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
 CONFIG_SENSORS_MAX16064=m
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
@@ -2725,6 +2768,7 @@ CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
@@ -2757,6 +2801,7 @@ CONFIG_SENSORS_MC13783_ADC=m
 #
 # ACPI drivers
 #
+CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=m
 CONFIG_THERMAL_HWMON=y
@@ -2832,6 +2877,15 @@ CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+# CONFIG_BCMA_HOST_PCI is not set
+# CONFIG_BCMA_DEBUG is not set
 CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_CORE=y
 CONFIG_MFD_SM501=m
@@ -2845,10 +2899,10 @@ CONFIG_TPS6507X=m
 CONFIG_MFD_WM8400=m
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
 CONFIG_ABX500_CORE=y
 CONFIG_EZX_PCAP=y
 CONFIG_AB8500_CORE=y
@@ -2917,7 +2971,9 @@ CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
 CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
 CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_RC_LOOPBACK=m
@@ -2943,6 +2999,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -2963,11 +3020,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# Encoders/decoders and other helper chips
+# Encoders, decoders, sensors and other helper chips
 #
 
 #
-# Audio decoders
+# Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
@@ -2977,7 +3034,6 @@ CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -2996,12 +3052,8 @@ CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_SAA7191=m
 CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
@@ -3011,6 +3063,7 @@ CONFIG_VIDEO_VPX3220=m
 #
 # Video and audio decoders
 #
+CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
@@ -3025,15 +3078,27 @@ CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_ADV7343=m
 CONFIG_VIDEO_AK881X=m
 
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_TCM825X=m
+
 #
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
@@ -3104,6 +3169,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KINECT=m
 CONFIG_USB_GSPCA_KONICA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
@@ -3163,7 +3229,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_DSBR=m
@@ -3330,6 +3395,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
@@ -3343,6 +3409,7 @@ CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
 CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
 
 #
 # DVB-C (cable) frontends
@@ -3486,6 +3553,7 @@ CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 CONFIG_FB_SAVAGE_ACCEL=y
@@ -3494,6 +3562,7 @@ CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
 CONFIG_FB_VIA=m
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
+# CONFIG_FB_VIA_X_COMPATIBILITY is not set
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=m
@@ -3515,6 +3584,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
 CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3534,6 +3604,7 @@ CONFIG_BACKLIGHT_CARILLO_RANCH=m
 CONFIG_BACKLIGHT_APPLE=m
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
@@ -3587,6 +3658,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 CONFIG_SND_SEQUENCER_OSS=y
 CONFIG_SND_HRTIMER=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_RTCTIMER=m
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_VERBOSE_PROCFS=y
@@ -3663,9 +3735,10 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
+# CONFIG_SND_ES1968_RADIO is not set
 CONFIG_SND_FM801=m
 CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
+CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
@@ -3693,6 +3766,7 @@ CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MAESTRO3_INPUT=y
@@ -3742,13 +3816,11 @@ CONFIG_USB_HIDDEV=y
 #
 # Special HID drivers
 #
-CONFIG_HID_3M_PCT=m
 CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=m
 CONFIG_HID_APPLE=m
 CONFIG_HID_BELKIN=m
-CONFIG_HID_CANDO=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_PRODIKEYS=m
@@ -3773,7 +3845,6 @@ CONFIG_LOGIG940_FF=y
 # CONFIG_LOGIWII_FF is not set
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MOSART=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
@@ -3796,7 +3867,6 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
-CONFIG_HID_STANTUM=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -3852,6 +3922,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
@@ -3952,7 +4023,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SAMBA=m
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
@@ -4081,6 +4151,7 @@ CONFIG_MMC_SPI=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
 CONFIG_MMC_USHC=m
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
@@ -4107,6 +4178,7 @@ CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
@@ -4183,76 +4255,7 @@ CONFIG_EDAC_I7CORE=m
 CONFIG_EDAC_I5000=m
 CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_BQ32K=m
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=m
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_MSM6242=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_RP5C01=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB8500=m
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_PCAP=m
-CONFIG_RTC_DRV_MC13XXX=m
+# CONFIG_RTC_CLASS is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -4303,7 +4306,6 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 CONFIG_DIGIEPCA=m
 CONFIG_RISCOM8=m
 CONFIG_SPECIALIX=m
@@ -4327,19 +4329,17 @@ CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_DVB_CXD2099=m
-CONFIG_USB_IP_COMMON=m
-CONFIG_USB_IP_VHCI_HCD=m
-CONFIG_USB_IP_HOST=m
-# CONFIG_USB_IP_DEBUG_ENABLE is not set
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
 CONFIG_W35UND=m
 CONFIG_PRISM2_USB=m
 CONFIG_ECHO=m
-CONFIG_BRCM80211=m
-CONFIG_BRCMSMAC=y
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
 # CONFIG_BRCMFMAC is not set
 # CONFIG_BRCMDBG is not set
-CONFIG_RT2860=m
-CONFIG_RT2870=m
 CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
 CONFIG_COMEDI_MISC_DRIVERS=m
@@ -4489,6 +4489,7 @@ CONFIG_IIO_RING_BUFFER=y
 CONFIG_IIO_SW_RING=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
 
 #
 # Accelerometers
@@ -4508,8 +4509,6 @@ CONFIG_SCA3000=m
 #
 # Analog to digital convertors
 #
-CONFIG_MAX1363=m
-CONFIG_MAX1363_RING_BUFFER=y
 CONFIG_AD7150=m
 CONFIG_AD7152=m
 CONFIG_AD7291=m
@@ -4522,11 +4521,14 @@ CONFIG_AD799X=m
 CONFIG_AD799X_RING_BUFFER=y
 CONFIG_AD7476=m
 CONFIG_AD7887=m
+CONFIG_AD7780=m
 CONFIG_AD7745=m
 CONFIG_AD7816=m
 CONFIG_ADT75=m
 CONFIG_ADT7310=m
 CONFIG_ADT7410=m
+CONFIG_MAX1363=m
+CONFIG_MAX1363_RING_BUFFER=y
 
 #
 # Analog digital bi-direction convertors
@@ -4540,6 +4542,8 @@ CONFIG_ADT7316_I2C=m
 #
 CONFIG_AD5624R_SPI=m
 CONFIG_AD5446=m
+CONFIG_AD5504=m
+CONFIG_AD5791=m
 CONFIG_MAX517=m
 
 #
@@ -4560,19 +4564,19 @@ CONFIG_ADIS16060=m
 CONFIG_ADIS16080=m
 CONFIG_ADIS16130=m
 CONFIG_ADIS16260=m
+CONFIG_ADXRS450=m
 
 #
 # Inertial measurement units
 #
-CONFIG_ADIS16300=m
-CONFIG_ADIS16350=m
 CONFIG_ADIS16400=m
 
 #
 # Light sensors
 #
-CONFIG_SENSORS_TSL2563=m
 CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
 
 #
 # Magnetometer sensors
@@ -4604,12 +4608,12 @@ CONFIG_AD2S1210_GPIO_NONE=y
 #
 # Triggers - standalone
 #
-CONFIG_IIO_PERIODIC_RTC_TRIGGER=m
 CONFIG_IIO_GPIO_TRIGGER=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 CONFIG_XVMALLOC=y
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set
+CONFIG_ZCACHE=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_FB_SM7XX=m
@@ -4659,6 +4663,7 @@ CONFIG_DRM_PSB=m
 # Altera FPGA firmware download module
 #
 CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4700,6 +4705,8 @@ CONFIG_INTEL_IPS=m
 CONFIG_IBM_RTL=m
 CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
 
 #
 # Firmware Drivers
@@ -4715,6 +4722,7 @@ CONFIG_DMI_SYSFS=m
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
 CONFIG_SIGMA=m
+# CONFIG_GOOGLE_FIRMWARE is not set
 
 #
 # File systems
@@ -4830,6 +4838,7 @@ CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
@@ -4903,7 +4912,6 @@ CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DFS_UPCALL is not set
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_ACL is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_NCPFS_IOCTL_LOCKING is not set
@@ -5010,7 +5018,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
 CONFIG_LKDTM=m
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -5119,7 +5128,6 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_FPU=m
 
 #
 # Hash modes
@@ -5215,8 +5223,6 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.9.1_for_2.6.39-rc5.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.9.1_for_2.6.39-rc5.diff.gz
deleted file mode 100644
index bbef2d4b03..0000000000
Binary files a/srcpkgs/kernel/patches/unionfs-2.5.9.1_for_2.6.39-rc5.diff.gz and /dev/null differ
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.9.2_for_3.0.0-rc4.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.9.2_for_3.0.0-rc4.diff.gz
new file mode 100644
index 0000000000..19da7dfcd8
Binary files /dev/null and b/srcpkgs/kernel/patches/unionfs-2.5.9.2_for_3.0.0-rc4.diff.gz differ
diff --git a/srcpkgs/kernel/patches/unionfs-2.5.9.1_for_2.6.39-rc5.diff.gz.args b/srcpkgs/kernel/patches/unionfs-2.5.9.2_for_3.0.0-rc4.diff.gz.args
similarity index 100%
rename from srcpkgs/kernel/patches/unionfs-2.5.9.1_for_2.6.39-rc5.diff.gz.args
rename to srcpkgs/kernel/patches/unionfs-2.5.9.2_for_3.0.0-rc4.diff.gz.args
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 10d4680429..239f5c131e 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -3,7 +3,7 @@
 
 pkgname=kernel
 build_style=custom-install
-short_desc="The Linux kernel and modules (2.6 branch)"
+short_desc="The Linux kernel and modules"
 long_desc="
  This package provides the linux kernel image and associated modules."
 subpackages="kernel-headers"
@@ -11,24 +11,29 @@ triggers="kernel-hooks"
 nostrip=yes
 noverifyrdeps=yes
 preserve=yes
-revision=1
 _kernel_headers_revision=${revision}
-if [ -n "${revision}" ]; then
-	_kernver="${version}_${revision}"
+if [ -n "${_kernel_ver_minor}" ]; then
+	_kernver="${version}.${_kernel_ver_minor}"
 else
 	_kernver="${version}"
 fi
+if [ -n "${_kernel_patch_ver}" ]; then
+	_kernver="${_kernver}-${_kernel_patch_ver}"
+fi
+if [ -n "${revision}" ]; then
+	_kernver="${_kernver}_${revision}"
+fi
 stow_copy_files="/lib/modules/${_kernver}/build"
+kernel_hooks_version="${_kernver}"
 
 Add_dependency run glibc
 Add_dependency run initramfs-tools
 Add_dependency run linux-firmware
-Add_dependency full coreutils
 Add_dependency full module-init-tools
-Add_dependency build xz
-Add_dependency build perl		">=0"
+Add_dependency build coreutils
+Add_dependency build perl	">=0"
 
-do_build()
+do_configure()
 {
 	# If there's a file called <arch>-dotconfig, use it to
 	# configure the kernel; otherwise use arch defaults and all stuff
@@ -41,7 +46,6 @@ do_build()
 		arch=x86_64
 	fi
 
-	# Configure
 	if [ -f ${FILESDIR}/${arch}-dotconfig ]; then
 		msg_normal " Detected a .config file for your arch, using it.\n"
 		cp -f ${FILESDIR}/${arch}-dotconfig .config
@@ -51,10 +55,12 @@ do_build()
 		make ${makejobs} defconfig && make ${makejobs} allmodconfig
 	fi
 	if [ -n "${revision}" ]; then
-		sed -i -e "s|LOCALVERSION=\"\"|LOCALVERSION=\"_${revision}\"|" \
-			.config
+		sed -i -e "s|\(LOCALVERSION\)=\"\"|\1=\"_${revision}\"|" .config
 	fi
-	# Build
+}
+
+do_build()
+{
 	make ${makejobs} prepare
 	make ${makejobs} bzImage modules
 }
@@ -73,13 +79,9 @@ do_install()
 	make INSTALL_MOD_PATH=${DESTDIR} modules_install
 
 	if [ -n "${_kernel_snapshot}" ]; then
-		lver="${_kernel_ver}.${_kernel_ver_minor}-${_kernel_patch_ver}"
+		lver="${_kernver}-${_kernel_patch_ver}"
 	else
-		lver=${version}
-	fi
-
-	if [ -n "$revision" ]; then
-		lver="${lver}_${revision}"
+		lver="${_kernver}"
 	fi
 
 	hdrdest=${DESTDIR}/usr/src/kernel-headers-${lver}