diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD
index 0be8658cc..6b15c565f 100644
--- a/core/linux-am33x/PKGBUILD
+++ b/core/linux-am33x/PKGBUILD
@@ -7,24 +7,44 @@ pkgbase=linux-am33x
 _srcname=linux-3.12
 _kernelname=${pkgbase#linux}
 _desc="TI AM335x Beaglebone (Black)"
-pkgver=3.12.0
-pkgrel=6
+pkgver=3.12.1
+pkgrel=1
+rcnrel=bone8
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
-        "rcn.patch.gz::http://rcn-ee.net/deb/sid-armhf/v3.12.0-bone8/patch-3.12-bone8.diff.gz"
+        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+        "http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver}-${rcnrel}.diff.gz"
+        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_srcname#linux-}"
         'config')
 md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
-         'b11fa32568cc8defa0951f6dbcf30850'
-         '54fa161ddba71158755eeb505d6e34f9')
+         '5a8cb5a659baeeb6df3fe22de8d32df6'
+         'be715d257adebfc7b7b04cf3d5599af3'
+         'SKIP'
+         '432f5f40cdfe993cfc43a27c18762094')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
-  git apply "${srcdir}/rcn.patch"
+  # add upstream patch
+  patch -p1 -i "${srcdir}/patch-${pkgver}"
+
+  # RCN patch
+  git apply "${srcdir}/patch-${pkgver}-${rcnrel}.diff"
+
+  # AUFS patches
+  cp -ru "${srcdir}/aufs3-standalone/Documentation" .
+  cp -ru "${srcdir}/aufs3-standalone/fs" .
+  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
 
   cat "${srcdir}/config" > ./.config
 
@@ -69,7 +89,7 @@ _package() {
   pkgdesc="The Linux Kernel and modules - ${_desc}"
   depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' 'linux=${pkgver}')
+  provides=('kernel26' 'linux=${pkgver}' 'aufs_friendly')
   conflicts=('linux-omap' 'linux-imx6' 'linux-armada370' 'linux-am33x-legacy')
   install=${pkgname}.install
 
diff --git a/core/linux-am33x/config b/core/linux-am33x/config
index b3fae2e0c..69590f5eb 100644
--- a/core/linux-am33x/config
+++ b/core/linux-am33x/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.0 Kernel Configuration
+# Linux/arm 3.12.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -4413,6 +4413,23 @@ CONFIG_F2FS_STAT_FS=y
 CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
+CONFIG_AUFS_FS=y
+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=y
+CONFIG_AUFS_HFSNOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_RDU=y
+CONFIG_AUFS_SP_IATTR=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V2=y