diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index 5dd0dedc2..90275873b 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -7,12 +7,12 @@
 buildarch=20
 
 pkgbase=linux-raspberrypi
-_commit=bec4f0aff550047407c86eab7f2699ed99c5176d
+_commit=ddabc66bccf573e00f23c6c09627194e6ec1fa68
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi"
 pkgver=3.18.5
-pkgrel=2
+pkgrel=3
 bfqver=v7r7
 arch=('armv6h' 'armv7h')
 url="http://www.kernel.org/"
@@ -30,7 +30,7 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'cmdline.txt'
         'config.v6'
         'config.v7')
-md5sums=('00bba260e300216ece5223d49d7f9f79'
+md5sums=('ef1fb69bb6522190f9cb318433419509'
          'SKIP'
          '1c7c2d0338939a9e6953a64d80861471'
          'a81346cce95baeac2c56cf60d3c7e5b6'
@@ -39,7 +39,7 @@ md5sums=('00bba260e300216ece5223d49d7f9f79'
          '2377702414f77f964fb97fb9ce9502b6'
          '60bc3624123c183305677097bcd56212'
          '291c9285b48b8f1798389ac634b6dfae'
-         'cfc81b2490e5338c8e4ee3df49197444')
+         '88a818ae651cd18afca6d0d83188d197')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -179,11 +179,14 @@ _package-headers() {
     cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
   done
 
+  [[ $CARCH == "armv6h" ]] && MACH="mach-bcm2708"
+  [[ $CARCH == "armv7h" ]] && MACH="mach-bcm2709"
+
   # copy arch includes for external modules
   mkdir -p ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH
   cp -a arch/$KARCH/include ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/
-  mkdir -p ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/mach-bcm2708
-  cp -a arch/$KARCH/mach-bcm2708/include ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/mach-bcm2708/
+  mkdir -p ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/$MACH
+  cp -a arch/$KARCH/$MACH/include ${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/$MACH/
 
   # copy files necessary for later builds, like nvidia and vmware
   cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
diff --git a/core/linux-raspberrypi/config.v7 b/core/linux-raspberrypi/config.v7
index 4a9d5ed09..3343173d4 100644
--- a/core/linux-raspberrypi/config.v7
+++ b/core/linux-raspberrypi/config.v7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.5-1 Kernel Configuration
+# Linux/arm 3.18.5-3 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -452,7 +452,8 @@ CONFIG_AEABI=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
-# CONFIG_HIGHMEM is not set
+CONFIG_HIGHMEM=y
+CONFIG_HIGHPTE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
 CONFIG_FLATMEM=y
@@ -467,6 +468,7 @@ CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
+CONFIG_BOUNCE=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_CLEANCACHE=y
@@ -3557,7 +3559,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_BCM2835=y
 CONFIG_MMC_BCM2835_DMA=y
 CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_SPI=m
 # CONFIG_MMC_DW is not set
 # CONFIG_MMC_VUB300 is not set
 # CONFIG_MMC_USHC is not set
@@ -4196,6 +4197,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_VM is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
 # CONFIG_DEBUG_SHIRQ is not set
 
 #