diff --git a/acpi_call/PKGBUILD b/acpi_call/PKGBUILD
index b5176503c..2bfaa47c8 100644
--- a/acpi_call/PKGBUILD
+++ b/acpi_call/PKGBUILD
@@ -8,17 +8,17 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=acpi_call
-pkgver=20101109
-pkgrel=3
+pkgver=20110218
+pkgrel=1
 pkgdesc="A kernel module that enables you to call parameterless ACPI methods by writing the method name to /proc/acpi/call, e.g. to turn off discrete graphics card in a dual graphics environment (like NVIDIA Optimus)."
 arch=('i686' 'x86_64')
 url=("http://github.com/mkottman/acpi_call")
 license=('GPL')
-depends=('kernel26' 'kernel26-headers')
+depends=('kernel26>=2.6.38rc5' 'kernel26-headers')
 makedepends=('git')
 install=acpi_call.install
 source=(http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('79e7a95ebeff1df29201cae22067921f')
+md5sums=('eedbf22f96b476a19c12a578f7dfef6c')
 
 
 # create tarball: source PKGBUILD && mksource
@@ -39,6 +39,9 @@ build() {
   cp -r ${srcdir}/$pkgname ${srcdir}/$pkgname-build
   cd ${srcdir}/$pkgname-build
 
+  sed \
+    -e  's/$(shell uname -r)/2.6.38-CHAKRA/g' \
+    -i Makefile
   make
 }
 package() {
diff --git a/broadcom-wl/PKGBUILD b/broadcom-wl/PKGBUILD
index eda9247ef..5ca522dc3 100644
--- a/broadcom-wl/PKGBUILD
+++ b/broadcom-wl/PKGBUILD
@@ -9,12 +9,12 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
 
 pkgname=broadcom-wl
 pkgver=5.100.82.38
-pkgrel=1
+pkgrel=2
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('i686' 'x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
 license=('custom')
-depends=('kernel26')
+depends=('kernel26>=2.6.38rc5')
 makedepends=('kernel26-headers')
 
 [ "$CARCH" = 'x86_64' ] && ARCH=x86_64 || ARCH=x86_32
diff --git a/kernel26/PKGBUILD b/kernel26/PKGBUILD
index 205efabc4..206e632b7 100644
--- a/kernel26/PKGBUILD
+++ b/kernel26/PKGBUILD
@@ -8,26 +8,28 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgbase="kernel26"
-pkgname=('kernel26' 'kernel26-headers') # Build stock -CHAKRA kernel
-# pkgname=kernel26-custom       # Build kernel with a different name
+pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -CHAKRA kernel
+#pkgname=kernel26-mainline       # Build kernel with a different name
 #_kernelname=${pkgname#kernel26}
 _kernelname=""
-_basekernel=2.6.37
-pkgver=${_basekernel}
-pkgrel=2
-_patchname="patch-${pkgver}-1-CHAKRA"
+_basekernel=2.6.38-rc5
+pkgver=2.6.38rc5
+pkgrel=1
+makedepends=('xmlto' 'docbook-xsl')
+_patchname="patch-${_basekernel}-${pkgrel}-CHAKRA"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.kernel.org"
-source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
+options=(!strip)
+source=(http://www.kernel.org/pub/linux/kernel/v2.6/testing/linux-$_basekernel.tar.bz2
         http://chakra-project.org/sources/kernel26/${_patchname}.bz2
         # the main kernel config files
         config config.x86_64
         # standard config files for mkinitcpio ramdisk
         kernel26.preset)
-md5sums=('c8ee37b4fdccdb651e0603d35350b434'
-         '8ed301302d7b2cb31ef0c7293ce4f5bb'
-         '1daf0dc043949ecc4f48afa4260e952a'
+md5sums=('136b0121f4a15fd9692fe80076eb677a'
+         'ce811208f2d261221da575f94d14089f'
+         '12c9b2c96500f3574d7a21bd593bdc10'
          '92f1276655f801d4cb7a80eb481b9226'
          '25584700a0a679542929c4bed31433b6')
 
@@ -44,20 +46,21 @@ build() {
   else
     cat ../config >./.config
   fi
+
+  sed -i 's|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|' .config
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
-
-  # hack to prevent output kernel from being marked as dirty or git
-  echo "" > ${srcdir}/linux-${_basekernel}/.scmversion
-
-  # get kernel version  
-  make prepare
+  sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/kconfig/streamline_config.pl # Fix localmodconfig
   # load configuration
   # Configure the kernel. Replace the line below with one of your choice.
+  #make localmodconfig # Configure automaticly for the local machine
   #make menuconfig # CLI menu for configuration
-  #make xconfig # X-based configuration
-  #make oldconfig # using old config from previous kernel version
+  #make nconfig # new CLI menu for configuration
+  #make xconfig # X-based configuration, needs qt3 to be installed
+  #make gconfig # GTK based configuration, needs gtk2 to be installed
+  make oldconfig # using old config from previous kernel version
+  #yes ""|make oldconfig # lazy version of the above
   # ... or manually edit .config
   ####################
   # stop here
@@ -67,13 +70,14 @@ build() {
   ####################
   yes "" | make config
   # build!
-  make bzImage modules || return 1
+  make ${MAKEFLAGS} bzImage modules
 }
 
 package_kernel26() {
-  pkgdesc="The Linux Kernel and modules"
-  backup=(etc/mkinitcpio.d/kernel26.preset)
-  depends=('coreutils' 'linux-firmware' 'module-init-tools' 'mkinitcpio>=0.6.3')
+  pkgdesc="The Linux Kernel and modules (mainline)"
+  groups=('base')
+  backup=(etc/mkinitcpio.d/${pkgname}.preset)
+  depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.12' 'mkinitcpio>=0.6.8')
   # pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now
   # nforce package support was abandoned by nvidia, kernel modules should cover everything now.
   # kernel24 support is dropped since glibc24
@@ -81,7 +85,7 @@ package_kernel26() {
             'alsa-driver' 'ieee80211' 'hostap-driver26'
             'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
             'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
-            'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'kernel26'
+            'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm'
             'aufs2')
   provides=('aufs2')
   install=kernel26.install
@@ -89,16 +93,18 @@ package_kernel26() {
 
   KARCH=x86
   cd ${srcdir}/linux-$_basekernel
+  # get kernel version
+  make prepare
   _kernver="$(make kernelrelease)"
-  mkdir -p ${pkgdir}/{lib/modules,boot}
-  make INSTALL_MOD_PATH=${pkgdir} modules_install || return 1
+  mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
+  make INSTALL_MOD_PATH=${pkgdir} modules_install
   cp System.map ${pkgdir}/boot/System.map26${_kernelname}
   cp arch/$KARCH/boot/bzImage ${pkgdir}/boot/vmlinuz26${_kernelname}
   #  # add vmlinux
   install -m644 -D vmlinux ${pkgdir}/usr/src/linux-${_kernver}/vmlinux
 
   # install fallback mkinitcpio.conf file and preset file for kernel
-  install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/kernel26.preset || return 1
+  install -m644 -D ${srcdir}/kernel26.preset ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
   # set correct depmod command for install
   sed \
     -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
@@ -106,21 +112,22 @@ package_kernel26() {
     -i $startdir/kernel26.install
   sed \
     -e "s|source .*|source /etc/mkinitcpio.d/kernel26${_kernelname}.kver|g" \
-    -e "s|default_image=.*|default_image=\"/boot/kernel26.img\"|g" \
-    -e "s|fallback_image=.*|fallback_image=\"/boot/kernel26-fallback.img\"|g" \
-    -i ${pkgdir}/etc/mkinitcpio.d/kernel26.preset
+    -e "s|default_image=.*|default_image=\"/boot/${pkgname}.img\"|g" \
+    -e "s|fallback_image=.*|fallback_image=\"/boot/${pkgname}-fallback.img\"|g" \
+    -i ${pkgdir}/etc/mkinitcpio.d/${pkgname}.preset
 
-  echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/kernel26.kver
+  echo -e "# DO NOT EDIT THIS FILE\nALL_kver='${_kernver}'" > ${pkgdir}/etc/mkinitcpio.d/${pkgname}.kver
   # remove build and source links
   rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
   # remove the firmware
   rm -rf ${pkgdir}/lib/firmware
+  # gzip -9 all modules to safe 100MB of space
+  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }
 
 package_kernel26-headers() {
   pkgdesc="Header files and scripts for building modules for kernel26"
-  cd ${srcdir}/linux-${_basekernel}/
-  make oldconfig && make prepare || return 1
+
   mkdir -p ${pkgdir}/lib/modules/${_kernver}
   cd ${pkgdir}/lib/modules/${_kernver}
   ln -sf ../../../usr/src/linux-${_kernver} build
@@ -132,11 +139,11 @@ package_kernel26-headers() {
   install -D -m644 .config \
     ${pkgdir}/usr/src/linux-${_kernver}/.config
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include
-  
-  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video; do
+
+  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do
     cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
   done
-  
+
   # copy arch includes for external modules
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/x86
   cp -a arch/x86/include ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/
@@ -159,7 +166,7 @@ package_kernel26-headers() {
   # add headers for lirc package
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video
   cp drivers/media/video/*.h  ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do # zc0301 - damaged
+  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
    cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
   done
@@ -191,11 +198,20 @@ package_kernel26-headers() {
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
   cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
   cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
+  # add dvb headers  
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb
+  cp drivers/media/dvb/dvb-usb/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends
+  cp drivers/media/dvb/frontends/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners
+  cp drivers/media/common/tuners/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/
   # add xfs and shmem for aufs building
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
   cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
-  # add headers for virtualbox
+  # add headers vor virtualbox
   # in reference to:
   # http://bugs.archlinux.org/task/14568
   cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
@@ -203,36 +219,32 @@ package_kernel26-headers() {
   # in reference to:
   # http://bugs.archlinux.org/task/14568
   cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
+  # add headers for crypto modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/22081
+  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
   # copy in Kconfig files
   for i in `find . -name "Kconfig*"`; do 
     mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
     cp $i ${pkgdir}/usr/src/linux-${_kernver}/$i
   done
 
-  #cd ${pkgdir}/usr/src/linux-${_kernver}/include && ln -s asm-$KARCH asm
-  # add header for aufs2-util
-  #mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/asm
-  #cp -a ${srcdir}/linux-$_basekernel/include/asm-generic/bitsperlong.h ${pkgdir}/usr/src/linux-${_kernver}/include/asm/
-
   chown -R root.root ${pkgdir}/usr/src/linux-${_kernver}
   find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
-  # fix aufs
-  # rm -rf ${pkgdir}/usr/src/linux-${_kernver}/include/linux/aufs_type.h
-
-  # fix io.h
-  sed \
-    -e  "s~#include <xen/xen.h>~~g" \
-    -i ${pkgdir}/usr/src/linux-${_kernver}/arch/x86/include/asm/io.h
 }
 
+package_kernel26-docs() {
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the Linux kernel."
 
-# package_kernel26-firmware() {     ##### This package miss important firmwares!!! it's deprecated, use linux-firmware instead.
-#   pkgdesc="The included firmware files of the Linux Kernel"
-#
-#   cd ${srcdir}/linux-$_basekernel
-#   make firmware || return 1
-#   make INSTALL_MOD_PATH=${pkgdir} firmware_install || return 1
-# }
+  cd ${srcdir}/linux-$_basekernel
+  mkdir -p $pkgdir/usr/src/linux-$_kernver
+  mv Documentation $pkgdir/usr/src/linux-$_kernver
+  find $pkgdir -type f -exec chmod 444 {} \;
+  find $pkgdir -type d -exec chmod 755 {} \;
+  # remove a file already in kernel26 package
+  rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
+}
 
+# vim:set ts=2 sw=2 et:
diff --git a/kernel26/config b/kernel26/config
index 5ef5eaa82..5f27e09cf 100644
--- a/kernel26/config
+++ b/kernel26/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.37 Kernel Configuration
-# Wed Jan  5 13:45:33 2011
+# Linux/i386 2.6.38 Kernel Configuration
+# Thu Feb 17 17:12:27 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -47,7 +47,6 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_HAVE_INTEL_TXT=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
 CONFIG_X86_TRAMPOLINE=y
@@ -67,14 +66,16 @@ CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-CHAKRA"
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -97,7 +98,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
@@ -152,10 +152,12 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
+# CONFIG_EXPERT is not set
 # CONFIG_EMBEDDED is not set
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
@@ -204,6 +206,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_HW_BREAKPOINT=y
@@ -289,6 +292,7 @@ CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
@@ -329,6 +333,7 @@ CONFIG_X86_GENERIC=y
 CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 # CONFIG_X86_PPRO_FENCE is not set
@@ -401,7 +406,8 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_COMPACTION is not set
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
@@ -412,6 +418,9 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -455,7 +464,6 @@ CONFIG_CAN_PM_TRACE=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_SLEEP=y
 # CONFIG_PM_SLEEP_ADVANCED_DEBUG is not set
-CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_SUSPEND_FREEZER=y
@@ -477,6 +485,7 @@ CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_DOCK=y
 CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
 CONFIG_ACPI_THERMAL=m
@@ -562,7 +571,7 @@ CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_CNB20LE_QUIRK=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_DMAR=y
 # CONFIG_DMAR_DEFAULT_ON is not set
 CONFIG_DMAR_FLOPPY_WA=y
@@ -589,6 +598,7 @@ CONFIG_ISA=y
 CONFIG_OLPC=y
 CONFIG_OLPC_XO1=m
 CONFIG_OLPC_OPENFIRMWARE=y
+CONFIG_OLPC_OPENFIRMWARE_DT=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -1061,7 +1071,9 @@ CONFIG_NET_CLS_IND=y
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_XPS=y
 
 #
 # Network testing
@@ -1232,6 +1244,7 @@ CONFIG_MTD_TESTS=m
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
 # CONFIG_MTD_AR7_PARTS is not set
 
 #
@@ -1304,6 +1317,21 @@ CONFIG_MTD_NAND_ECC_SMC=y
 #
 # CONFIG_MTD_LPDDR is not set
 # CONFIG_MTD_UBI is not set
+CONFIG_OF=y
+
+#
+# Device Tree and Open Firmware support
+#
+CONFIG_PROC_DEVICETREE=y
+CONFIG_OF_PROMTREE=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=m
+CONFIG_OF_NET=y
+CONFIG_OF_SPI=y
+CONFIG_OF_MDIO=m
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
 CONFIG_PARPORT_SERIAL=m
@@ -1660,6 +1688,7 @@ CONFIG_SATA_PMP=y
 CONFIG_SATA_AHCI=m
 CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
 CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 
@@ -1762,6 +1791,7 @@ CONFIG_BLK_DEV_DM=m
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
@@ -1769,6 +1799,10 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -2022,6 +2056,7 @@ CONFIG_ATH_COMMON=m
 # CONFIG_ATH_DEBUG is not set
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
+CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
@@ -2040,6 +2075,7 @@ CONFIG_B43_PCICORE_AUTOSELECT=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_LEDS=y
 CONFIG_B43_HWRNG=y
@@ -2113,14 +2149,13 @@ CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
-CONFIG_RT2800PCI_PCI=y
 CONFIG_RT2800PCI=m
-CONFIG_RT2800PCI_RT30XX=y
+CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT30XX=y
+CONFIG_RT2800USB_RT33XX=y
 CONFIG_RT2800USB_RT35XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
@@ -2132,13 +2167,17 @@ 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_RTLWIFI=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX=m
-CONFIG_WL1271=m
-CONFIG_WL1271_SPI=m
-CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_HT=y
+CONFIG_WL12XX_SPI=m
+CONFIG_WL12XX_SDIO=m
+CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2163,6 +2202,7 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_SMSC75XX=m
 CONFIG_USB_NET_SMSC95XX=m
@@ -2497,6 +2537,7 @@ CONFIG_JOYSTICK_ZHENHUA=m
 CONFIG_JOYSTICK_DB9=m
 CONFIG_JOYSTICK_GAMECON=m
 CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
 CONFIG_JOYSTICK_JOYDUMP=m
 CONFIG_JOYSTICK_XPAD=m
 CONFIG_JOYSTICK_XPAD_FF=y
@@ -2559,6 +2600,7 @@ CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
 CONFIG_TOUCHSCREEN_TSC2007=m
 # CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_AD714X=m
@@ -2575,7 +2617,6 @@ CONFIG_INPUT_POWERMATE=m
 CONFIG_INPUT_YEALINK=m
 CONFIG_INPUT_CM109=m
 CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
 CONFIG_INPUT_PCF50633_PMU=m
 CONFIG_INPUT_PCF8574=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
@@ -2584,6 +2625,8 @@ CONFIG_INPUT_WM831X_ON=m
 CONFIG_INPUT_ADXL34X=m
 CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
 
 #
 # Hardware I/O ports
@@ -2655,11 +2698,15 @@ CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_TIMBERDALE=m
+CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
 CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_IFX6X60=m
+CONFIG_SERIAL_PCH_UART=m
 CONFIG_UNIX98_PTYS=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_LEGACY_PTYS is not set
@@ -2697,7 +2744,6 @@ CONFIG_IPWIRELESS=m
 CONFIG_MWAVE=m
 CONFIG_PC8736x_GPIO=m
 CONFIG_NSC_GPIO=m
-CONFIG_CS5535_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
@@ -2719,6 +2765,7 @@ CONFIG_I2C_MUX=m
 #
 # Multiplexer I2C Chip support
 #
+CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 CONFIG_I2C_HELPER_AUTO=y
@@ -2764,6 +2811,7 @@ CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
+CONFIG_I2C_EG20T=m
 
 #
 # External I2C/SMBus adapter drivers
@@ -2793,9 +2841,10 @@ CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=y
 CONFIG_SPI_TOPCLIFF_PCH=m
 CONFIG_SPI_XILINX=m
-CONFIG_SPI_XILINX_PLTFM=m
 # CONFIG_SPI_DESIGNWARE is not set
 
 #
@@ -2815,6 +2864,12 @@ CONFIG_PPS=m
 #
 CONFIG_PPS_CLIENT_KTIMER=m
 CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+
+#
+# PPS generators support
+#
+CONFIG_PPS_GENERATOR_PARPORT=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_DEBUG_GPIO is not set
@@ -2845,6 +2900,7 @@ CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_LANGWELL=y
 CONFIG_GPIO_PCH=m
+CONFIG_GPIO_ML_IOH=m
 CONFIG_GPIO_TIMBERDALE=y
 CONFIG_GPIO_RDC321X=m
 
@@ -2881,6 +2937,7 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
@@ -2898,8 +2955,10 @@ CONFIG_BATTERY_OLPC=m
 CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
 CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2927,6 +2986,7 @@ CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_F71805F=m
@@ -2967,6 +3027,7 @@ CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
 CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
@@ -3021,6 +3082,7 @@ CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
 CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
 CONFIG_GEODE_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -3037,6 +3099,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_SC1200_WDT=m
 CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
 CONFIG_60XX_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC7240_WDT=m
@@ -3105,11 +3168,14 @@ CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
 CONFIG_ABX500_CORE=y
 CONFIG_EZX_PCAP=y
+# CONFIG_AB8500_CORE is not set
+CONFIG_MFD_CS5535=m
 CONFIG_MFD_TIMBERDALE=m
 CONFIG_LPC_SCH=m
 CONFIG_MFD_RDC321X=m
 CONFIG_MFD_JANZ_CMODIO=m
 CONFIG_MFD_VX855=m
+CONFIG_MFD_WL1273_CORE=m
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -3118,8 +3184,6 @@ CONFIG_MEDIA_SUPPORT=m
 #
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 
@@ -3128,8 +3192,7 @@ CONFIG_VIDEO_MEDIA=m
 #
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
+CONFIG_RC_CORE=m
 CONFIG_LIRC=m
 CONFIG_RC_MAP=m
 CONFIG_IR_NEC_DECODER=m
@@ -3144,6 +3207,8 @@ CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_RC_LOOPBACK=m
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
@@ -3167,7 +3232,6 @@ CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
@@ -3193,7 +3257,6 @@ CONFIG_VIDEO_IR_I2C=m
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
 CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
 CONFIG_VIDEO_TEA6415C=m
 CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
@@ -3280,6 +3343,7 @@ CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_TIMBERDALE=m
 CONFIG_VIDEO_CX88=m
 CONFIG_VIDEO_CX88_ALSA=m
 CONFIG_VIDEO_CX88_BLACKBIRD=m
@@ -3306,6 +3370,7 @@ CONFIG_SOC_CAMERA_MT9V022=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_CAMERA_PLATFORM=m
+CONFIG_SOC_CAMERA_OV2640=m
 CONFIG_SOC_CAMERA_OV6650=m
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
@@ -3363,15 +3428,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
 CONFIG_VIDEO_CX231XX_ALSA=m
 CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
 CONFIG_USB_ET61X251=m
-CONFIG_USB_SE401=m
 CONFIG_USB_SN9C102=m
 CONFIG_USB_PWC=m
 # CONFIG_USB_PWC_DEBUG is not set
@@ -3387,7 +3448,6 @@ CONFIG_RADIO_RTRACK=m
 CONFIG_RADIO_RTRACK2=m
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
 CONFIG_RADIO_MAXIRADIO=m
 CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_MIROPCM20=m
@@ -3408,6 +3468,7 @@ CONFIG_RADIO_TEA5764=m
 CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_TIMBERDALE=m
+CONFIG_RADIO_WL1273=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3597,7 +3658,9 @@ CONFIG_DVB_S5H1411=m
 #
 # ISDB-T (terrestrial) frontends
 #
+CONFIG_DVB_S921=m
 CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
 
 #
 # Digital terrestrial only tuners/PLL
@@ -3622,8 +3685,6 @@ CONFIG_DVB_IX2505V=m
 # Tools to develop new frontends
 #
 # CONFIG_DVB_DUMMY_FE is not set
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
 
 #
 # Graphics support
@@ -3673,6 +3734,7 @@ CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
+# CONFIG_FB_WMT_GE_ROPS is not set
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
@@ -3744,6 +3806,7 @@ CONFIG_FB_TRIDENT=m
 # CONFIG_FB_GEODE is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_SM501 is not set
+CONFIG_FB_UDL=m
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
@@ -3954,7 +4017,6 @@ CONFIG_SND_HDA_POWER_SAVE=y
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
 CONFIG_SND_HDSP=m
 CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
 CONFIG_SND_ICE1712=m
 CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
@@ -3990,6 +4052,7 @@ CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
 CONFIG_SND_SOC=m
+CONFIG_SND_SOC_CACHE_LZO=y
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
 # CONFIG_SOUND_PRIME is not set
@@ -4020,6 +4083,7 @@ CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_CYPRESS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
 CONFIG_HID_EGALAX=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EZKEY=m
@@ -4038,6 +4102,7 @@ CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MOSART=m
 CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -4051,6 +4116,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_ROCCAT_KONE=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
@@ -4260,13 +4326,15 @@ CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
 # CONFIG_USB_GADGET_M66592 is not set
 # CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_CI13XXX_PCI is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_NET2280=m
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LANGWELL is not set
+# CONFIG_USB_GADGET_EG20T is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
 # CONFIG_USB_ZERO is not set
@@ -4274,6 +4342,7 @@ CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
 CONFIG_USB_GADGETFS=m
 CONFIG_USB_FUNCTIONFS=m
 CONFIG_USB_FUNCTIONFS_ETH=y
@@ -4307,6 +4376,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
@@ -4323,6 +4393,7 @@ CONFIG_SDIO_UART=m
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_OF=m
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC_TIFM_SD=m
@@ -4355,6 +4426,7 @@ CONFIG_LEDS_NET5501=m
 CONFIG_LEDS_PCA9532=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_GPIO_OF=y
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -4382,6 +4454,8 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 #
 # iptables trigger is under Netfilter config (LED target)
 #
+CONFIG_NFC_DEVICES=y
+CONFIG_PN544_NFC=m
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 # CONFIG_INFINIBAND is not set
@@ -4422,7 +4496,6 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
 CONFIG_RTC_DRV_TEST=m
 
 #
@@ -4536,10 +4609,10 @@ CONFIG_VIDEO_CX25821_ALSA=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_STRADIS=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_SE401=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_IP_VHCI_HCD=m
 CONFIG_USB_IP_HOST=m
@@ -4711,18 +4784,18 @@ CONFIG_USB_SERIAL_QUATECH2=m
 CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_VT6655=m
 CONFIG_VT6656=m
-CONFIG_FB_UDL=m
 CONFIG_HYPERV=m
 CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BLOCK=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_UTILS=m
 # CONFIG_VME_BUS is not set
+CONFIG_DX_SEP=m
 # CONFIG_IIO is not set
+CONFIG_CS5535_GPIO=m
 CONFIG_ZRAM=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
-# CONFIG_BATMAN_ADV is not set
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_FB_SM7XX=m
 CONFIG_VIDEO_DT3155=m
@@ -4733,7 +4806,6 @@ CONFIG_CRYSTALHD=m
 # Texas Instruments shared transport line discipline
 #
 CONFIG_ST_BT=m
-CONFIG_ADIS16255=m
 CONFIG_FB_XGI=m
 # CONFIG_LIRC_STAGING is not set
 CONFIG_SMB_FS=m
@@ -4785,6 +4857,8 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m
 CONFIG_SPEAKUP_SYNTH_SPKOUT=m
 CONFIG_SPEAKUP_SYNTH_TXPRT=m
 CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -4869,7 +4943,6 @@ CONFIG_JFS_POSIX_ACL=y
 CONFIG_JFS_SECURITY=y
 # CONFIG_JFS_DEBUG is not set
 CONFIG_JFS_STATISTICS=y
-CONFIG_FS_POSIX_ACL=y
 CONFIG_XFS_FS=m
 CONFIG_XFS_QUOTA=y
 CONFIG_XFS_POSIX_ACL=y
@@ -4886,6 +4959,7 @@ CONFIG_OCFS2_FS_STATS=y
 CONFIG_BTRFS_FS=m
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=m
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
@@ -4976,8 +5050,9 @@ CONFIG_JFFS2_RTIME=y
 CONFIG_LOGFS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_XATTRS=y
-CONFIG_SQUASHFS_LZMA=y
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
 # CONFIG_SQUASHFS_EMBEDDED is not set
 CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_VXFS_FS is not set
@@ -4992,23 +5067,6 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
-CONFIG_AUFS_FS=m
-CONFIG_AUFS_BRANCH_MAX_127=y
-# CONFIG_AUFS_BRANCH_MAX_511 is not set
-# CONFIG_AUFS_BRANCH_MAX_1023 is not set
-# CONFIG_AUFS_BRANCH_MAX_32767 is not set
-CONFIG_AUFS_SBILIST=y
-# CONFIG_AUFS_HNOTIFY is not set
-# CONFIG_AUFS_EXPORT is not set
-# CONFIG_AUFS_RDU is not set
-CONFIG_AUFS_SP_IATTR=y
-# CONFIG_AUFS_SHWH is not set
-# CONFIG_AUFS_BR_RAMFS is not set
-CONFIG_AUFS_BR_FUSE=y
-CONFIG_AUFS_POLL=y
-CONFIG_AUFS_BR_HFSPLUS=y
-CONFIG_AUFS_BDEV_LOOP=y
-# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
@@ -5208,6 +5266,7 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_RING_BUFFER_ALLOW_SWAP=y
 CONFIG_TRACING=y
@@ -5248,6 +5307,7 @@ CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_DEBUG_RODATA is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
 # CONFIG_IOMMU_STRESS is not set
@@ -5270,6 +5330,8 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0
 # Security options
 #
 CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
@@ -5341,6 +5403,7 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_FPU=m
 
 #
 # Hash modes
@@ -5373,6 +5436,7 @@ CONFIG_CRYPTO_WP512=m
 #
 CONFIG_CRYPTO_AES=m
 CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_BLOWFISH=m
@@ -5402,6 +5466,9 @@ CONFIG_CRYPTO_LZO=m
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -5414,6 +5481,7 @@ CONFIG_HAVE_KVM_IRQCHIP=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_KVM_APIC_ARCHITECTURE=y
 CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=m
 CONFIG_KVM_INTEL=m
@@ -5447,11 +5515,20 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_BZIP2=y
 CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
 CONFIG_DECOMPRESS_LZO=y
-CONFIG_DECOMPRESS_LZMA_NEEDED=y
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
@@ -5463,3 +5540,4 @@ CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_NLATTR=y
 CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
diff --git a/kernel26/kernel26.install b/kernel26/kernel26.install
index f8adcba36..716f213cc 100644
--- a/kernel26/kernel26.install
+++ b/kernel26/kernel26.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=2.6.37-CHAKRA
+KERNEL_VERSION=2.6.38-CHAKRA
 
 post_install () {
   # updating module dependencies
diff --git a/linux-2.6-CHAKRA/PATCHCFG b/linux-2.6-CHAKRA/PATCHCFG
index a15bc33a9..e82d4e32a 100644
--- a/linux-2.6-CHAKRA/PATCHCFG
+++ b/linux-2.6-CHAKRA/PATCHCFG
@@ -1,38 +1,38 @@
 # Kernel source file
-SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.37.tar.bz2"
+SRC="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.38-rc5.tar.bz2"
 # Original source directory
-SRCORIG="linux-2.6.37"
+SRCORIG="linux-2.6.38-rc5"
 # Our source directory
-SRCNAME="linux-2.6.37-CHAKRA"
+SRCNAME="linux-2.6.38-rc5-CHAKRA"
 # Patches:
 #   URL%patchlevel
 #  or
 #   filename%patchlevel (file must be in patches subdirectory)
 PATCHES=(
-         # add upstream patch from 2.6.37 series
-         #http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.37.1.bz2%1
+         # add upstream patch from 2.6.38 series
+         #http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.38.1.bz2%1
 
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
          # add aufs2 support, in reference to:
          # http://aufs.sourceforge.net
-         http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2-kbuild.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2-base.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2-standalone.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/aufs2.1/aufs2.1-2010-12-20.patch.bz2%1
+         http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2-kbuild-30.patch%1
+         http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2-base-38.patch%1
+         http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2-standalone-38.patch%1
+         http://chakra-project.org/sources/kernel26/patches/38/aufs2.1/aufs2.1-standalone.tree-38-rcN-20110207.patch.bz2%1
          # squashfs with lzma
-         http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/01-squashfs_revert_to_2.6.35.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/02-squashfs_add_lzma.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/03-squashfs_make_lzma_available.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/04-decompress_unlzo_fix.patch%1
-         http://chakra-project.org/sources/kernel26/patches/37/squashfs-lzma/05-fix_building_squashfs_with_xattrs.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/01-squashfs_revert_to_2.6.35.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/02-squashfs_add_lzma.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/03-squashfs_make_lzma_available.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/04-decompress_unlzo_fix.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/38/squashfs-lzma/05-fix_building_squashfs_with_xattrs.patch%1
          # sched_autogroup
-         http://chakra-project.org/sources/kernel26/patches/37/autogroup/kernel2.6.37-cgroup.patch%1
+         #http://chakra-project.org/sources/kernel26/patches/38/autogroup/kernel2.6.38-cgroup.patch%1
 
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.37-1-CHAKRA"
+PATCHNAME="patch-2.6.38-rc5-1-CHAKRA"
 
 # Run this before applying patches
 pre_apply() {
diff --git a/mkinitcpio-busybox/PKGBUILD b/mkinitcpio-busybox/PKGBUILD
index 96a3a577a..e99a9476c 100644
--- a/mkinitcpio-busybox/PKGBUILD
+++ b/mkinitcpio-busybox/PKGBUILD
@@ -1,40 +1,34 @@
-# $Id: PKGBUILD 79944 2010-05-09 17:50:54Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
 pkgname=mkinitcpio-busybox
-pkgver=1.16.1
-pkgrel=3
+pkgver=1.18.2
+pkgrel=1
 pkgdesc="base initramfs tools"
 arch=('i686' 'x86_64')
 url="http://www.busybox.net/"
 license=('GPL')
 depends=('glibc')
 source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2
-        config
-        loadfont-setfont-optional-psf2-font-support.patch)
-sha256sums=('6d45ec8e72ca85516c8669f81267e0fbe11881435983e32532a56b44651dd6c5'
-            'd629e936941c854e7aa5e1b564d74bde3a1d328f1e0dd30c86a958d2724685ce'
-            '624d21345cd869c174a3ae1b9cfe23a461ce8b463c7ac4c052726430890c4eb1')
+        config)
+sha256sums=('aa7e1cec8cd9c7f4e56098b9e4bb2ab5d593d5a35f766ad9e6a312289bf57080'
+            'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194')
 
 build() {
   cd "${srcdir}/busybox-${pkgver}"
 
-  # Backport http://git.busybox.net/busybox/commit/?id=8ce1dc03c1b2b61e51527b987579c09c991cc4b2
-  # to busybox 1.16 to fix https://bugs.archlinux.org/task/19109
-  patch -p1 -i ../loadfont-setfont-optional-psf2-font-support.patch || return 1
-
   unset CFLAGS CXXFLAGS
-  # -fno-tree-pta is required to work around a bug in gcc 4.5.0
-  # A patch is scheduled to be backported to 4.5.1, so we can remove it
-  # once that is released. Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43987
   if [ ${CARCH} = "x86_64" ]; then
-    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -O0 -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
+    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
   else
-    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -O0 -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
+    sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config
   fi
-  make || return 1
+  make
 }
 
 package() {
   install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox"
-}
-# vim:set ts=2 sw=2 et:
+}
\ No newline at end of file
diff --git a/mkinitcpio-busybox/config b/mkinitcpio-busybox/config
index a67ca3391..1aa333faf 100644
--- a/mkinitcpio-busybox/config
+++ b/mkinitcpio-busybox/config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.16.1
-# Sun Apr 11 13:13:36 2010
+# Busybox version: 1.18.2
+# Wed Jan 26 23:08:18 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -16,6 +16,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_EXTRA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
 # CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -23,12 +24,23 @@ CONFIG_SHOW_USAGE=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
 CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
 # CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_FEATURE_ASSUME_UNICODE is not set
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
 # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=63
+CONFIG_LAST_SUPPORTED_WCHAR=767
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_WTMP is not set
+# CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_PIDFILE is not set
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -63,9 +75,8 @@ CONFIG_NO_DEBUG_LIB=y
 # CONFIG_EFENCE is not set
 
 #
-# Installation Options
+# Installation Options ("make install" behavior)
 #
-# CONFIG_INSTALL_NO_USR is not set
 CONFIG_INSTALL_APPLET_SYMLINKS=y
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
 # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
@@ -82,6 +93,7 @@ CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=3
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
+# CONFIG_FEATURE_USE_TERMIOS is not set
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
@@ -105,12 +117,14 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 #
 # Archival Utilities
 #
+# CONFIG_FEATURE_SEAMLESS_XZ is not set
 # CONFIG_FEATURE_SEAMLESS_LZMA is not set
 # CONFIG_FEATURE_SEAMLESS_BZ2 is not set
 # CONFIG_FEATURE_SEAMLESS_GZ is not set
 # CONFIG_FEATURE_SEAMLESS_Z is not set
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_FEATURE_AR_CREATE is not set
 # CONFIG_BUNZIP2 is not set
 # CONFIG_BZIP2 is not set
 # CONFIG_CPIO is not set
@@ -134,19 +148,34 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 # CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
 # CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+# CONFIG_FEATURE_TAR_TO_COMMAND is not set
 # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
 # CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
+# CONFIG_FEATURE_TAR_SELINUX is not set
 # CONFIG_UNCOMPRESS is not set
 # CONFIG_UNLZMA is not set
 # CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+# CONFIG_UNXZ is not set
+# CONFIG_XZ is not set
 # CONFIG_UNZIP is not set
 
 #
 # Coreutils
 #
 CONFIG_BASENAME=y
-# CONFIG_CAL is not set
 CONFIG_CAT=y
+# CONFIG_DATE is not set
+# CONFIG_FEATURE_DATE_ISOFMT is not set
+# CONFIG_FEATURE_DATE_NANO is not set
+# CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+# CONFIG_TR is not set
+# CONFIG_FEATURE_TR_CLASSES is not set
+# CONFIG_FEATURE_TR_EQUIV is not set
+# CONFIG_BASE64 is not set
+# CONFIG_CAL is not set
 # CONFIG_CATV is not set
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
@@ -158,9 +187,6 @@ CONFIG_CHROOT=y
 CONFIG_CP=y
 # CONFIG_FEATURE_CP_LONG_OPTIONS is not set
 CONFIG_CUT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
 CONFIG_DD=y
 # CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
 # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
@@ -241,12 +267,7 @@ CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
 # CONFIG_TEE is not set
 # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
 CONFIG_TRUE=y
 # CONFIG_TTY is not set
 CONFIG_UNAME=y
@@ -282,6 +303,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 # Console Utilities
 #
 # CONFIG_CHVT is not set
+# CONFIG_FGCONSOLE is not set
 # CONFIG_CLEAR is not set
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
@@ -323,6 +345,7 @@ CONFIG_MKTEMP=y
 #
 # Editors
 #
+# CONFIG_PATCH is not set
 CONFIG_AWK=y
 # CONFIG_FEATURE_AWK_LIBM is not set
 # CONFIG_CMP is not set
@@ -330,7 +353,6 @@ CONFIG_AWK=y
 # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
 # CONFIG_FEATURE_DIFF_DIR is not set
 # CONFIG_ED is not set
-# CONFIG_PATCH is not set
 CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=4096
@@ -344,6 +366,7 @@ CONFIG_FEATURE_VI_READONLY=y
 CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 # CONFIG_FEATURE_ALLOW_EXEC is not set
 
@@ -386,6 +409,12 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 #
 # Init Utilities
 #
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 # CONFIG_INIT is not set
 # CONFIG_FEATURE_USE_INITTAB is not set
 # CONFIG_FEATURE_KILL_REMOVED is not set
@@ -395,33 +424,31 @@ CONFIG_FEATURE_KILL_DELAY=0
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_INITRD is not set
-# CONFIG_HALT is not set
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
 
 #
 # Login/Password Management Utilities
 #
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
 # CONFIG_FEATURE_SHADOWPASSWDS is not set
 # CONFIG_USE_BB_PWD_GRP is not set
 # CONFIG_USE_BB_SHADOW is not set
 # CONFIG_USE_BB_CRYPT is not set
 # CONFIG_USE_BB_CRYPT_SHA is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=0
+CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_ADDGROUP is not set
 # CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELUSER is not set
 # CONFIG_DELGROUP is not set
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_DELUSER is not set
 # CONFIG_GETTY is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
 # CONFIG_LOGIN is not set
 # CONFIG_PAM is not set
 # CONFIG_LOGIN_SCRIPTS is not set
@@ -443,10 +470,12 @@ CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_CHATTR is not set
 # CONFIG_FSCK is not set
 # CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
 
 #
 # Linux Module Utilities
 #
+CONFIG_MODINFO=y
 # CONFIG_MODPROBE_SMALL is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
@@ -477,6 +506,8 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
 #
 # Linux System Utilities
 #
+# CONFIG_BLOCKDEV is not set
+# CONFIG_REV is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
@@ -494,8 +525,10 @@ CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 # CONFIG_FEATURE_SGI_LABEL is not set
 # CONFIG_FEATURE_SUN_LABEL is not set
 # CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FINDFS is not set
+# CONFIG_FLOCK is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_EXT2 is not set
@@ -525,25 +558,6 @@ CONFIG_LOSETUP=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 # CONFIG_MORE is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_VOLUMEID=y
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 CONFIG_MOUNT=y
 CONFIG_FEATURE_MOUNT_FAKE=y
 CONFIG_FEATURE_MOUNT_VERBOSE=y
@@ -571,13 +585,42 @@ CONFIG_FEATURE_UMOUNT_ALL=y
 # Common options for mount/umount
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_VOLUMEID=y
+
+#
+# Filesystem/Volume identification
+#
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
 
 #
 # Miscellaneous Utilities
 #
+# CONFIG_CONSPY is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
 # CONFIG_ADJTIMEX is not set
 # CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
 # CONFIG_BEEP is not set
 CONFIG_FEATURE_BEEP_FREQ=0
 CONFIG_FEATURE_BEEP_LENGTH_MS=0
@@ -640,6 +683,7 @@ CONFIG_FEATURE_LESS_FLAGS=y
 # CONFIG_MT is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
+# CONFIG_RFKILL is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 # CONFIG_SETSID is not set
@@ -656,6 +700,11 @@ CONFIG_STRINGS=y
 #
 # Networking Utilities
 #
+# CONFIG_NBDCLIENT is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+# CONFIG_NC_110_COMPAT is not set
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
 CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
@@ -687,6 +736,7 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -729,9 +779,6 @@ CONFIG_IPRULE=y
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
 # CONFIG_NAMEIF is not set
 # CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
 CONFIG_NETSTAT=y
 CONFIG_FEATURE_NETSTAT_WIDE=y
 CONFIG_FEATURE_NETSTAT_PRG=y
@@ -744,6 +791,7 @@ CONFIG_FEATURE_FANCY_PING=y
 # CONFIG_PSCAN is not set
 CONFIG_ROUTE=y
 # CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
 CONFIG_TELNET=y
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 # CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
@@ -752,6 +800,10 @@ CONFIG_TELNET=y
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 CONFIG_TFTP=y
 # CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
 CONFIG_FEATURE_TFTP_GET=y
 # CONFIG_FEATURE_TFTP_PUT is not set
 # CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
@@ -762,6 +814,8 @@ CONFIG_FEATURE_TFTP_GET=y
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+# CONFIG_TUNCTL is not set
+# CONFIG_FEATURE_TUNCTL_UG is not set
 # CONFIG_UDHCPD is not set
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
@@ -775,16 +829,14 @@ CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_DEFAULT_SCRIPT=""
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
+# CONFIG_UDPSVD is not set
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
-# CONFIG_TCPSVD is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDPSVD is not set
 
 #
 # Print Utilities
@@ -807,6 +859,11 @@ CONFIG_FEATURE_MIME_CHARSET=""
 #
 # Process Utilities
 #
+# CONFIG_IOSTAT is not set
+# CONFIG_MPSTAT is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_SMEMCAP is not set
 CONFIG_FREE=y
 # CONFIG_FUSER is not set
 CONFIG_KILL=y
@@ -869,9 +926,6 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 # Shells
 #
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
 CONFIG_ASH_BASH_COMPAT=y
 CONFIG_ASH_JOB_CONTROL=y
@@ -885,10 +939,13 @@ CONFIG_ASH_CMDCMD=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_RANDOM_SUPPORT is not set
 CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_CTTYHACK=y
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
@@ -896,16 +953,21 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_CASE is not set
 # CONFIG_HUSH_FUNCTIONS is not set
 # CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_LASH is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
 # CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
 CONFIG_SH_MATH_SUPPORT=y
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_CTTYHACK=y
 
 #
 # System Logging Utilities
@@ -914,9 +976,11 @@ CONFIG_CTTYHACK=y
 # CONFIG_FEATURE_ROTATE_LOGFILE is not set
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_SYSLOGD_DUP is not set
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
 # CONFIG_FEATURE_IPC_SYSLOG is not set
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 # CONFIG_KLOGD is not set
+# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 # CONFIG_LOGGER is not set
diff --git a/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch b/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch
deleted file mode 100644
index a7592de09..000000000
--- a/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch
+++ /dev/null
@@ -1,453 +0,0 @@
-From 8ce1dc03c1b2b61e51527b987579c09c991cc4b2 Mon Sep 17 00:00:00 2001
-From: Harald Becker <ralda@gmx.de>
-Date: Sun, 21 Feb 2010 12:10:26 +0000
-Subject: loadfont/setfont: optional PSF2 font support
-
-Signed-off-by: Harald Becker <ralda@gmx.de>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
-diff --git a/console-tools/Config.in b/console-tools/Config.in
-index cd0a931..195685b 100644
---- a/console-tools/Config.in
-+++ b/console-tools/Config.in
-@@ -135,4 +135,21 @@ config SHOWKEY
- 	help
- 	  Shows keys pressed.
- 
-+comment "Common options for loadfont and setfont"
-+	depends on LOADFONT || SETFONT
-+
-+config FEATURE_LOADFONT_PSF2
-+	bool "Support for PSF2 console fonts"
-+	default n
-+	depends on LOADFONT || SETFONT
-+	help
-+	  Support PSF2 console fonts.
-+
-+config FEATURE_LOADFONT_RAW
-+	bool "Support for old (raw) console fonts"
-+	default n
-+	depends on LOADFONT || SETFONT
-+	help
-+	  Support old (raw) console fonts.
-+
- endmenu
-diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
-index e833474..e51142c 100644
---- a/console-tools/loadfont.c
-+++ b/console-tools/loadfont.c
-@@ -13,7 +13,7 @@
- #include <sys/kd.h>
- 
- #ifndef KDFONTOP
--#define KDFONTOP 0x4B72
-+# define KDFONTOP 0x4B72
- struct console_font_op {
- 	unsigned op;            /* KD_FONT_OP_* */
- 	unsigned flags;         /* KD_FONT_FLAG_* */
-@@ -21,91 +21,137 @@ struct console_font_op {
- 	unsigned charcount;
- 	unsigned char *data;    /* font data with height fixed to 32 */
- };
--
--#define KD_FONT_OP_SET          0  /* Set font */
--#define KD_FONT_OP_GET          1  /* Get font */
--#define KD_FONT_OP_SET_DEFAULT  2  /* Set font to default,
--                                         data points to name / NULL */
--#define KD_FONT_OP_COPY         3  /* Copy from another console */
--
--#define KD_FONT_FLAG_OLD        0x80000000 /* Invoked via old interface */
--#define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */
-+# define KD_FONT_OP_SET          0  /* Set font */
-+# define KD_FONT_OP_GET          1  /* Get font */
-+# define KD_FONT_OP_SET_DEFAULT  2  /* Set font to default, data points to name / NULL */
-+# define KD_FONT_OP_COPY         3  /* Copy from another console */
-+# define KD_FONT_FLAG_OLD        0x80000000 /* Invoked via old interface */
-+# define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */
-                                    /* (Used internally for PIO_FONT support) */
- #endif /* KDFONTOP */
- 
- 
- enum {
--	PSF_MAGIC1 = 0x36,
--	PSF_MAGIC2 = 0x04,
--
--	PSF_MODE512 = 0x01,
--	PSF_MODEHASTAB = 0x02,
--	PSF_MAXMODE = 0x03,
--	PSF_SEPARATOR = 0xffff
-+	PSF1_MAGIC0 = 0x36,
-+	PSF1_MAGIC1 = 0x04,
-+	PSF1_MODE512 = 0x01,
-+	PSF1_MODEHASTAB = 0x02,
-+	PSF1_MODEHASSEQ = 0x04,
-+	PSF1_MAXMODE = 0x05,
-+	PSF1_STARTSEQ = 0xfffe,
-+	PSF1_SEPARATOR = 0xffff,
- };
- 
--struct psf_header {
--	unsigned char magic1, magic2;   /* Magic number */
-+struct psf1_header {
-+	unsigned char magic[2];         /* Magic number */
- 	unsigned char mode;             /* PSF font mode */
- 	unsigned char charsize;         /* Character size */
- };
- 
--#define PSF_MAGIC_OK(x)	((x)->magic1 == PSF_MAGIC1 && (x)->magic2 == PSF_MAGIC2)
-+#define psf1h(x) ((struct psf1_header*)(x))
-+
-+#define PSF1_MAGIC_OK(x) ( \
-+     (x)->magic[0] == PSF1_MAGIC0 \
-+  && (x)->magic[1] == PSF1_MAGIC1 \
-+)
-+
-+#if ENABLE_FEATURE_LOADFONT_PSF2
-+enum {
-+	PSF2_MAGIC0 = 0x72,
-+	PSF2_MAGIC1 = 0xb5,
-+	PSF2_MAGIC2 = 0x4a,
-+	PSF2_MAGIC3 = 0x86,
-+	PSF2_HAS_UNICODE_TABLE = 0x01,
-+	PSF2_MAXVERSION = 0,
-+	PSF2_STARTSEQ = 0xfe,
-+	PSF2_SEPARATOR = 0xff
-+};
-+
-+struct psf2_header {
-+	unsigned char magic[4];
-+	unsigned int version;
-+	unsigned int headersize;    /* offset of bitmaps in file */
-+	unsigned int flags;
-+	unsigned int length;        /* number of glyphs */
-+	unsigned int charsize;      /* number of bytes for each character */
-+	unsigned int height;        /* max dimensions of glyphs */
-+	unsigned int width;         /* charsize = height * ((width + 7) / 8) */
-+};
-+
-+#define psf2h(x) ((struct psf2_header*)(x))
-+
-+#define PSF2_MAGIC_OK(x) ( \
-+     (x)->magic[0] == PSF2_MAGIC0 \
-+  && (x)->magic[1] == PSF2_MAGIC1 \
-+  && (x)->magic[2] == PSF2_MAGIC2 \
-+  && (x)->magic[3] == PSF2_MAGIC3 \
-+)
-+#endif /* ENABLE_FEATURE_LOADFONT_PSF2 */
- 
--static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize)
-+
-+static void do_loadfont(int fd, unsigned char *inbuf, int height, int width, int charsize, int fontsize)
- {
--	char *buf;
-+	unsigned char *buf;
-+	int charwidth = 32 * ((width+7)/8);
- 	int i;
- 
--	if (unit < 1 || unit > 32)
--		bb_error_msg_and_die("bad character size %d", unit);
-+	if (height < 1 || height > 32 || width < 1 || width > 32)
-+		bb_error_msg_and_die("bad character size %dx%d", height, width);
- 
--	buf = xzalloc(16 * 1024);
-+	buf = xzalloc(charwidth * ((fontsize < 128) ? 128 : fontsize));
- 	for (i = 0; i < fontsize; i++)
--		memcpy(buf + (32 * i), inbuf + (unit * i), unit);
-+		memcpy(buf + (i*charwidth), inbuf + (i*charsize), charsize);
- 
- 	{ /* KDFONTOP */
- 		struct console_font_op cfo;
--
- 		cfo.op = KD_FONT_OP_SET;
- 		cfo.flags = 0;
--		cfo.width = 8;
--		cfo.height = unit;
-+		cfo.width = width;
-+		cfo.height = height;
- 		cfo.charcount = fontsize;
--		cfo.data = (void*)buf;
--#if 0
--		if (!ioctl_or_perror(fd, KDFONTOP, &cfo, "KDFONTOP ioctl failed (will try PIO_FONTX)"))
--			goto ret;  /* success */
--#else
-+		cfo.data = buf;
- 		xioctl(fd, KDFONTOP, &cfo);
--#endif
- 	}
- 
--#if 0
--/* These ones do not honour -C tty (they set font on current tty regardless)
-- * On x86, this distinction is visible on framebuffer consoles
-- * (regular character consoles may have only one shared font anyway)
-- */
--#if defined(PIO_FONTX) && !defined(__sparc__)
--	{
--		struct consolefontdesc cfd;
--
--		cfd.charcount = fontsize;
--		cfd.charheight = unit;
--		cfd.chardata = buf;
--
--		if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)"))
--			goto ret;  /* success */
--	}
--#endif
--	xioctl(fd, PIO_FONT, buf);
-- ret:
--#endif /* 0 */
- 	free(buf);
- }
- 
--static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
-+/*
-+ * Format of the Unicode information:
-+ *
-+ * For each font position <uc>*<seq>*<term>
-+ * where <uc> is a 2-byte little endian Unicode value (PSF1)
-+ * or an UTF-8 coded value (PSF2),
-+ * <seq> = <ss><uc><uc>*, <ss> = psf1 ? 0xFFFE : 0xFE,
-+ * <term> = psf1 ? 0xFFFF : 0xFF.
-+ * and * denotes zero or more occurrences of the preceding item.
-+ *
-+ * Semantics:
-+ * The leading <uc>* part gives Unicode symbols that are all
-+ * represented by this font position. The following sequences
-+ * are sequences of Unicode symbols - probably a symbol
-+ * together with combining accents - also represented by
-+ * this font position.
-+ *
-+ * Example:
-+ * At the font position for a capital A-ring glyph, we
-+ * may have:
-+ *	00C5,212B,FFFE,0041,030A,FFFF
-+ * Some font positions may be described by sequences only,
-+ * namely when there is no precomposed Unicode value for the glyph.
-+ */
-+#if !ENABLE_FEATURE_LOADFONT_PSF2
-+#define do_loadtable(fd, inbuf, tailsz, fontsize, psf2) \
-+	do_loadtable(fd, inbuf, tailsz, fontsize)
-+#endif
-+static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, int psf2)
- {
-+#if !ENABLE_FEATURE_LOADFONT_PSF2
-+/* gcc 4.3.1 code size: */
-+# define psf2 0 /* +0 bytes */
-+//	const int psf2 = 0; /* +8 bytes */
-+//	enum { psf2 = 0 }; /* +13 bytes */
-+#endif
- 	struct unimapinit advice;
- 	struct unimapdesc ud;
- 	struct unipair *up;
-@@ -114,15 +160,48 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
- 	uint16_t unicode;
- 
- 	maxct = tailsz;	/* more than enough */
--	up = xmalloc(maxct * sizeof(struct unipair));
-+	up = xmalloc(maxct * sizeof(*up));
- 
- 	for (glyph = 0; glyph < fontsize; glyph++) {
--		while (tailsz >= 2) {
--			unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0];
--			tailsz -= 2;
--			inbuf += 2;
--			if (unicode == PSF_SEPARATOR)
--				break;
-+		while (tailsz > 0) {
-+			if (!psf2) { /* PSF1 */
-+				unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0];
-+				tailsz -= 2;
-+				inbuf += 2;
-+				if (unicode == PSF1_SEPARATOR)
-+					break;
-+			} else { /* PSF2 */
-+#if ENABLE_FEATURE_LOADFONT_PSF2
-+				--tailsz;
-+				unicode = *inbuf++;
-+				if (unicode == PSF2_SEPARATOR) {
-+					break;
-+				} else if (unicode == PSF2_STARTSEQ) {
-+					bb_error_msg_and_die("unicode sequences not implemented");
-+				} else if (unicode >= 0xC0) {
-+					if (unicode >= 0xFC)
-+						unicode &= 0x01, maxct = 5;
-+					else if (unicode >= 0xF8)
-+						unicode &= 0x03, maxct = 4;
-+					else if (unicode >= 0xF0)
-+						unicode &= 0x07, maxct = 3;
-+					else if (unicode >= 0xE0)
-+						unicode &= 0x0F, maxct = 2;
-+					else
-+						unicode &= 0x1F, maxct = 1;
-+					do {
-+						if (tailsz <= 0 || *inbuf < 0x80 || *inbuf > 0xBF)
-+							bb_error_msg_and_die("illegal UTF-8 character");
-+						--tailsz;
-+						unicode = (unicode << 6) + (*inbuf++ & 0x3F);
-+					} while (--maxct > 0);
-+				} else if (unicode >= 0x80) {
-+					bb_error_msg_and_die("illegal UTF-8 character");
-+				}
-+#else
-+				return;
-+#endif
-+			}
- 			up[ct].unicode = unicode;
- 			up[ct].fontpos = glyph;
- 			ct++;
-@@ -139,58 +218,78 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
- 	ud.entry_ct = ct;
- 	ud.entries = up;
- 	xioctl(fd, PIO_UNIMAP, &ud);
-+#undef psf2
- }
- 
--static void do_load(int fd, struct psf_header *psfhdr, size_t len)
-+static void do_load(int fd, unsigned char *buffer, size_t len)
- {
--	int unit;
--	int fontsize;
--	int hastable;
--	unsigned head0, head = head;
--
--	/* test for psf first */
--	if (len >= sizeof(struct psf_header) && PSF_MAGIC_OK(psfhdr)) {
--		if (psfhdr->mode > PSF_MAXMODE)
-+	int height;
-+	int width = 8;
-+	int charsize;
-+	int fontsize = 256;
-+	int has_table = 0;
-+	unsigned char *font = buffer;
-+	unsigned char *table;
-+
-+	if (len >= sizeof(struct psf1_header) && PSF1_MAGIC_OK(psf1h(buffer))) {
-+		if (psf1h(buffer)->mode > PSF1_MAXMODE)
- 			bb_error_msg_and_die("unsupported psf file mode");
--		fontsize = ((psfhdr->mode & PSF_MODE512) ? 512 : 256);
--#if !defined(PIO_FONTX) || defined(__sparc__)
--		if (fontsize != 256)
--			bb_error_msg_and_die("only fontsize 256 supported");
-+		if (psf1h(buffer)->mode & PSF1_MODE512)
-+			fontsize = 512;
-+		if (psf1h(buffer)->mode & PSF1_MODEHASTAB)
-+			has_table = 1;
-+		height = charsize = psf1h(buffer)->charsize;
-+		font += sizeof(struct psf1_header);
-+	} else
-+#if ENABLE_FEATURE_LOADFONT_PSF2
-+	if (len >= sizeof(struct psf2_header) && PSF2_MAGIC_OK(psf2h(buffer))) {
-+		if (psf2h(buffer)->version > PSF2_MAXVERSION)
-+			bb_error_msg_and_die("unsupported psf file version");
-+		fontsize = psf2h(buffer)->length;
-+		if (psf2h(buffer)->flags & PSF2_HAS_UNICODE_TABLE)
-+			has_table = 2;
-+		charsize = psf2h(buffer)->charsize;
-+		height = psf2h(buffer)->height;
-+		width = psf2h(buffer)->width;
-+		font += psf2h(buffer)->headersize;
-+	} else
- #endif
--		hastable = (psfhdr->mode & PSF_MODEHASTAB);
--		unit = psfhdr->charsize;
--		head0 = sizeof(struct psf_header);
--
--		head = head0 + fontsize * unit;
--		if (head > len || (!hastable && head != len))
--			bb_error_msg_and_die("input file: bad length");
--	} else {
--		/* file with three code pages? */
--		if (len == 9780) {
--			head0 = 40;
--			unit = 16;
--		} else {
--			/* bare font */
--			if (len & 0377)
--				bb_error_msg_and_die("input file: bad length");
--			head0 = 0;
--			unit = len / 256;
--		}
--		fontsize = 256;
--		hastable = 0;
-+#if ENABLE_FEATURE_LOADFONT_RAW
-+	if (len == 9780) {	/* file with three code pages? */
-+		charsize = height = 16;
-+		font += 40;
-+	} else if ((len & 0377) == 0) {		/* bare font */
-+		charsize = height = len / 256;
-+	} else
-+#endif
-+	{
-+		bb_error_msg_and_die("input file: bad length or unsupported font type");
- 	}
- 
--	do_loadfont(fd, (unsigned char *)psfhdr + head0, unit, fontsize);
--	if (hastable)
--		do_loadtable(fd, (unsigned char *)psfhdr + head, len - head, fontsize);
-+#if !defined(PIO_FONTX) || defined(__sparc__)
-+	if (fontsize != 256)
-+		bb_error_msg_and_die("only fontsize 256 supported");
-+#endif
-+
-+	table = font + fontsize * charsize;
-+	buffer += len;
-+
-+	if (table > buffer || (!has_table && table != buffer))
-+		bb_error_msg_and_die("input file: bad length");
-+
-+	do_loadfont(fd, font, height, width, charsize, fontsize);
-+
-+	if (has_table)
-+		do_loadtable(fd, table, buffer - table, fontsize, has_table - 1);
- }
- 
-+
- #if ENABLE_LOADFONT
- int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int loadfont_main(int argc UNUSED_PARAM, char **argv)
- {
- 	size_t len;
--	struct psf_header *psfhdr;
-+	unsigned char *buffer;
- 
- 	// no arguments allowed!
- 	opt_complementary = "=0";
-@@ -202,11 +301,11 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
- 	 * just read the entire file.
- 	 */
- 	len = 32*1024; // can't be larger
--	psfhdr = xmalloc_read(STDIN_FILENO, &len);
-+	buffer = xmalloc_read(STDIN_FILENO, &len);
- 	// xmalloc_open_zipped_read_close(filename, &len);
--	if (!psfhdr)
-+	if (!buffer)
- 		bb_perror_msg_and_die("error reading input font");
--	do_load(get_console_fd_or_die(), psfhdr, len);
-+	do_load(get_console_fd_or_die(), buffer, len);
- 
- 	return EXIT_SUCCESS;
- }
-@@ -269,7 +368,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
- 	size_t len;
- 	unsigned opts;
- 	int fd;
--	struct psf_header *psfhdr;
-+	unsigned char *buffer;
- 	char *mapfilename;
- 	const char *tty_name = CURRENT_TTY;
- 
-@@ -287,10 +386,10 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
- 	}
- 	// load font
- 	len = 32*1024; // can't be larger
--	psfhdr = xmalloc_open_zipped_read_close(*argv, &len);
--	if (!psfhdr)
-+	buffer = xmalloc_open_zipped_read_close(*argv, &len);
-+	if (!buffer)
- 		bb_simple_perror_msg_and_die(*argv);
--	do_load(fd, psfhdr, len);
-+	do_load(fd, buffer, len);
- 
- 	// load the screen map, if any
- 	if (opts & 1) { // -m
---
-cgit v0.8.2.1
diff --git a/mkinitcpio/PKGBUILD b/mkinitcpio/PKGBUILD
index 7e528e494..beb23f135 100644
--- a/mkinitcpio/PKGBUILD
+++ b/mkinitcpio/PKGBUILD
@@ -4,28 +4,26 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=mkinitcpio
-pkgver=0.6.7
-pkgrel=2
+pkgver=0.6.8
+pkgrel=1
 pkgdesc="Modular initramfs image creation utility"
 arch=(any)
 url="http://www.archlinux.org/"
 license=('GPL')
 depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux-ng>=2.17' 'gen-init-cpio' 'coreutils'
          'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=150' 'file' 'gzip'
-         'which' 'mkinitcpio-nfs-utils')
+         'which')
 optdepends=('xz: Use lzma compression for the initramfs image'
-            'bzip2: Use bzip2 compression for the initramfs image')
+            'bzip2: Use bzip2 compression for the initramfs image'
+            'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
           'klibc-module-init-tools' 'klibc-udev')
 source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 backup=(etc/mkinitcpio.conf)
-sha256sums=('8d34bfa9c8018f02ee938ac68285e3aa16a1ad84ddc0433998e2d43a428cdcbd')
+sha256sums=('b2bb47594d6d7a75086dce9205040eebc2459a0371b4d269f10452907a0865c3')
 
-build() {
+package() {
   cd $srcdir/${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/module-init-tools/PKGBUILD b/module-init-tools/PKGBUILD
index b4e61c272..b63204512 100644
--- a/module-init-tools/PKGBUILD
+++ b/module-init-tools/PKGBUILD
@@ -1,28 +1,37 @@
-# $Id: PKGBUILD 65219 2010-01-25 07:32:18Z allan $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=module-init-tools
-pkgver=3.11.1
-pkgrel=2
+pkgver=3.12
+pkgrel=1
 pkgdesc="utilities needed by Linux systems for managing loadable kernel modules"
 arch=('i686' 'x86_64')
 url="http://kerneltools.org"
 license=('GPL')
-groups=('base')
 depends=('glibc')
 backup=('etc/modprobe.d/modprobe.conf')
 source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2
         modprobe.conf)
-md5sums=('28dfcb9e24cdbeb12b99ac1eb8af7dea'
+md5sums=('8b2257ce9abef74c4a44d825d23140f3'
          '316f1bda4c21af02b30252eb014a0a55')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   
-  ./configure --prefix=/usr --exec-prefix=/
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  # do not regenerate man pages
+  touch *.{5,8}
+  
+  ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
+  make DESTDIR=$pkgdir install
  
   # Install our custom (read: empty) modprobe.conf
   install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf
diff --git a/ndiswrapper/PKGBUILD b/ndiswrapper/PKGBUILD
index da8b3733a..7d3c59794 100644
--- a/ndiswrapper/PKGBUILD
+++ b/ndiswrapper/PKGBUILD
@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=ndiswrapper
 pkgver=1.56
-pkgrel=11
+pkgrel=12
 
 # Find the kernel name inside the chroot
 _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
@@ -19,25 +19,18 @@ license=('GPL')
 arch=(i686 x86_64)
 url="http://ndiswrapper.sourceforge.net"
 install="ndiswrapper.install"
-depends=("ndiswrapper-utils=$pkgver" 'kernel26')
+depends=("ndiswrapper-utils=$pkgver" 'kernel26>=2.6.38rc5')
 makedepends=('kernel26-headers')
-source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz kernel-2.6.35.patch ndiswrapper-ioctl.patch)
-md5sums=('1431f7ed5f8e92e752d330bbb3aed333'
-         '0a03d613b1fd545a75c5dd1a7c2aaec4'
-         'a71bd3add8802e1b2fdff55bf6d0577e')
-groups=("kernel26-modules")
-conflicts=("ndiswrapper")
-replaces=("ndiswrapper")
-
+source=(http://downloads.sourceforge.net/sourceforge/ndiswrapper/ndiswrapper-$pkgver.tar.gz
+        kernel-2.6.35.patch
+        kernel-2.6.36.patch)
 build()
 {
   cd $srcdir/ndiswrapper-$pkgver/driver
   patch -Np2 -i $startdir/kernel-2.6.35.patch
-  cd $srcdir/ndiswrapper-$pkgver/
-  patch -Np0 -i $startdir/ndiswrapper-ioctl.patch
-  cd $srcdir/ndiswrapper-$pkgver/driver
-  make KVERS=$_kernver || return 1
-  make DESTDIR=$pkgdir KVERS=$_kernver install || return 1
+  patch -Np2 -i $startdir/kernel-2.6.36.patch
+  make KVERS=$_kernver
+  make DESTDIR=$pkgdir KVERS=$_kernver install
   rm $pkgdir/lib/modules/$_kernver/modules.* #wtf?
 
   sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
@@ -47,3 +40,6 @@ build()
   rm -r $pkgdir/lib/modules/$_kernver/misc/
 }
 
+md5sums=('1431f7ed5f8e92e752d330bbb3aed333'
+         '0a03d613b1fd545a75c5dd1a7c2aaec4'
+         'cc16ed13449f17e90865df688b180b2c')
\ No newline at end of file
diff --git a/squashfs-tools/PKGBUILD b/squashfs-tools/PKGBUILD
index dd804b2c5..e40495205 100644
--- a/squashfs-tools/PKGBUILD
+++ b/squashfs-tools/PKGBUILD
@@ -4,32 +4,29 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgname=squashfs-tools
-pkgver=4.0.lzma
+pkgver=4.1
+_gitcheckout=20101231
 pkgrel=1
 pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
 url="http://squashfs.sourceforge.net"
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=('zlib' 'glibc')
-source=(squashfs4.0-lzma-snapshot.tgz 
-	http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2
-	Makefile)
+depends=('zlib' 'glibc' 'lzo2' 'xz')
+source=("http://chakra-project.org/sources/${pkgname}/squashfs-${pkgver}-${_gitcheckout}.tar.xz")
+md5sums=('98e880d4b3f2bc282f35a29116c6663a')
 
-build()
-{
-    cd $startdir/src/squashfs4.0-lzma-snapshot/$pkgname
+build() {
+    cd ${srcdir}/squashfs-${pkgver}-${_gitcheckout}/${pkgname}
     #reduce memory requirements of unsquashfs to support installation on systems with 256 MB RAM 
-    sed -i -e 's/BUFFER_DEFAULT [0-9]*/BUFFER_DEFAULT 32/' $startdir/src/squashfs4.0-lzma-snapshot/$pkgname/unsquashfs.h
-    cp -f $srcdir/Makefile $srcdir/squashfs4.0-lzma-snapshot/$pkgname
-    make || return 1
-    mkdir -p $startdir/pkg/sbin
-    cp -a mksquashfs unsquashfs $startdir/pkg/sbin
+    sed -i -e 's/BUFFER_DEFAULT [0-9]*/BUFFER_DEFAULT 32/' ${srcdir}/squashfs-${pkgver}-${_gitcheckout}/${pkgname}/unsquashfs.h
+    sed -i 's|^#XZ_SUPPORT = 1|XZ_SUPPORT = 1|' Makefile
+    sed -i 's|^#LZO_SUPPORT = 1|LZO_SUPPORT = 1|' Makefile
+    make
 }
-md5sums=('a2e01bcd59a56cf17587d6481f341b64'
-         '29d5ffd03a5a3e51aef6a74e9eafb759'
-         '06a8f904515801c8a66c7b806b0f901a')
 
+package() {
+    cd ${srcdir}/squashfs-${pkgver}-${_gitcheckout}/${pkgname}
+    install -Dm755 mksquashfs ${pkgdir}/sbin/mksquashfs
+    install -m755 unsquashfs ${pkgdir}/sbin/unsquashfs
+}
\ No newline at end of file
diff --git a/tiacx/PKGBUILD b/tiacx/PKGBUILD
index b836bd4a3..1a2ec9e3a 100644
--- a/tiacx/PKGBUILD
+++ b/tiacx/PKGBUILD
@@ -9,12 +9,12 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=tiacx
 pkgver=20080210
-pkgrel=23
+pkgrel=24
 pkgdesc="OpenSource module for Texas Instruments ACX100/ACX111 wireless chips. For stock chakra 2.6 kernel"
 arch=(i686 x86_64)
 url="http://acx100.sourceforge.net/"
 license=('MPL')
-depends=('wireless_tools' 'kernel26' 'tiacx-firmware')
+depends=('wireless_tools' 'kernel26>=2.6.38rc5' 'tiacx-firmware')
 makedepends=('kernel26-headers' 'kernel26-headers')
 install=acx.install
 source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2
@@ -22,7 +22,7 @@ source=(http://downloads.sourceforge.net/sourceforge/acx100/acx-$pkgver.tar.bz2
         kernel-2.6.30.patch
         kernel-2.6.31.patch
         kernel-2.6.33.patch)
-_kernver=2.6.37-CHAKRA
+_kernver=2.6.38-CHAKRA
 
 build() {
     cd $startdir/src/acx-$pkgver
diff --git a/tiacx/acx.install b/tiacx/acx.install
index 69916de78..eed85b246 100644
--- a/tiacx/acx.install
+++ b/tiacx/acx.install
@@ -1,19 +1,19 @@
 # arg 1:  the new package version
 post_install() {
-  KERNEL_VERSION='2.6.37-CHAKRA'
+  KERNEL_VERSION='2.6.38-CHAKRA'
   depmod $KERNEL_VERSION > /dev/null 2>&1 
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  KERNEL_VERSION='2.6.37-CHAKRA'
+  KERNEL_VERSION='2.6.38-CHAKRA'
   depmod $KERNEL_VERSION > /dev/null 2>&1	 
   
 }
 
 # arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION='2.6.37-CHAKRA'
+  KERNEL_VERSION='2.6.38-CHAKRA'
   depmod $KERNEL_VERSION > /dev/null 2>&1	 
 }
diff --git a/vhba-module/PKGBUILD b/vhba-module/PKGBUILD
index 593527172..d3b755e97 100644
--- a/vhba-module/PKGBUILD
+++ b/vhba-module/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=vhba-module
 pkgver=20100822
-_kernver='2.6.37-CHAKRA'
-pkgrel=1
+_kernver='2.6.38-CHAKRA'
+pkgrel=2
 pkgdesc="Kernel module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
diff --git a/vhba-module/vhba-module.install b/vhba-module/vhba-module.install
index 1c4cbefc1..f4d7b7e7a 100644
--- a/vhba-module/vhba-module.install
+++ b/vhba-module/vhba-module.install
@@ -1,7 +1,7 @@
 post_install() {
   echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot."
   echo ">> This module needs to be recompiled for every kernel version upgrade."
-  KERNEL_VERSION='2.6.37-CHAKRA'
+  KERNEL_VERSION='2.6.38-CHAKRA'
   depmod $KERNEL_VERSION > /dev/null 2>&1
 }
 
@@ -10,7 +10,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  KERNEL_VERSION='2.6.37-CHAKRA'
+  KERNEL_VERSION='2.6.38-CHAKRA'
   depmod $KERNEL_VERSION > /dev/null 2>&1
 }