diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index 2e408f8d7..4eea6f77f 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -4,13 +4,13 @@
 buildarch=18
 
 pkgbase=linux-raspberrypi
-_commit=3eae23e90df575520c36ce9e5eec15ba25945973
+_commit=9301f9aff699bc90c194e41c3fa6117a36c4954a
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi"
-pkgver=3.12.35
+pkgver=3.12.36
 pkgrel=1
-arch=('arm armv6h')
+arch=('arm' 'armv6h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'uboot-mkimage' 'git' 'python2' 'bc')
@@ -21,9 +21,8 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'boot-uncompressed.txt'
         'imagetool-uncompressed.py'
         "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}.31+")
-
-md5sums=('4e4b6a540c2d21a1fb51c1cd1fd8d4bf'
-         '8b7bd41aefda27aea5ea523da0f38445'
+md5sums=('eba15f7a9eaa9d3fafb51a0c4c62f62b'
+         'a06c670c77c317340933103bbcb997da'
          '9335d1263fd426215db69841a380ea26'
          'a00e424e2fbb8c5a5f77ba2c4871bed4'
          '2f82dbe5752af65ff409d737caf11954'
@@ -42,10 +41,10 @@ prepare() {
   cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux
   cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
 
-  patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch
-  patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
-  patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
-  patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
+  git apply ../aufs3-standalone/aufs3-kbuild.patch
+  git apply ../aufs3-standalone/aufs3-base.patch
+  git apply ../aufs3-standalone/aufs3-mmap.patch
+  git apply ../aufs3-standalone/aufs3-standalone.patch
 
   cat "${srcdir}/config" > ./.config
 
diff --git a/core/linux-raspberrypi/config b/core/linux-raspberrypi/config
index da3a8ae76..12d8315c4 100644
--- a/core/linux-raspberrypi/config
+++ b/core/linux-raspberrypi/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.34-1 Kernel Configuration
+# Linux/arm 3.12.36-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1813,7 +1813,7 @@ CONFIG_MAX_RAW_DEVS=256
 # CONFIG_TCG_TPM is not set
 CONFIG_BRCM_CHAR_DRIVERS=y
 CONFIG_BCM_VC_CMA=y
-# CONFIG_BCM_VC_SM is not set
+CONFIG_BCM_VC_SM=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1893,7 +1893,15 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_GPIO=m
 
 #
 # PPS generators support
@@ -2506,7 +2514,9 @@ CONFIG_VIDEO_IR_I2C=m
 #
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
 CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
 
 #
 # RDS decoders
@@ -2517,6 +2527,9 @@ CONFIG_VIDEO_WM8775=m
 #
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
 
 #
 # Video and audio decoders
@@ -2530,6 +2543,7 @@ CONFIG_VIDEO_CX25840=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
 #
@@ -3368,8 +3382,11 @@ CONFIG_ZRAM=y
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 CONFIG_STAGING_MEDIA=y
-# CONFIG_DVB_AS102 is not set
-# CONFIG_VIDEO_GO7007 is not set
+CONFIG_DVB_AS102=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
 CONFIG_USB_MSI3101=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_IGORPLUGUSB=m