diff --git a/core/linux-armv5/PKGBUILD b/core/linux-armv5/PKGBUILD
index b73be85aa..a4ae35cfe 100644
--- a/core/linux-armv5/PKGBUILD
+++ b/core/linux-armv5/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-armv5
 _srcname=linux-3.12
 _kernelname=${pkgbase#linux}
 _desc="ARMv5 based platforms"
-pkgver=3.12.5
+pkgver=3.12.6
 pkgrel=1
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -16,11 +16,13 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_srcname#linux-}"
         'config'
         'imx23-olinuxino.patch')
 md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c'
-         '70e456d21f7e7c0dc2f9bd170f1ae4ee'
-         '8218a12034d632133052aff3594121a2'
+         '9e75be8b127e58f1a76c0015eabb12ae'
+         'SKIP'
+         '3488d59f80893e6334964ee4840cb4a3'
          '4424a769ce79478e8d71e288b61f368f')
 
 prepare() {
@@ -31,6 +33,17 @@ prepare() {
 
   patch -Np1 -i "${srcdir}/imx23-olinuxino.patch"
 
+  # 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
 
   # add pkgrel to extraversion
diff --git a/core/linux-armv5/config b/core/linux-armv5/config
index bdc3f1c23..1a8483e1f 100644
--- a/core/linux-armv5/config
+++ b/core/linux-armv5/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.0 Kernel Configuration
+# Linux/arm 3.12.6-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3038,7 +3038,9 @@ CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
 CONFIG_R8712U=m
-# CONFIG_R8188EU is not set
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
 CONFIG_RTS5139=m
 # CONFIG_RTS5139_DEBUG is not set
 # CONFIG_TRANZPORT is not set
@@ -3501,6 +3503,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=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=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