diff --git a/core/linux-odroid/PKGBUILD b/core/linux-odroid/PKGBUILD
index dd3ce0a93..7a1401cbf 100644
--- a/core/linux-odroid/PKGBUILD
+++ b/core/linux-odroid/PKGBUILD
@@ -8,21 +8,21 @@ pkgname=('linux-odroid-x' 'linux-odroid-x2' 'linux-odroid-u2' 'linux-headers-odr
 _kernelname=${pkgname#linux}
 _basekernel=3.8
 pkgver=${_basekernel}.13.21
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://github.com/hardkernel/linux/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'git' 'inetutils' 'bc')
 options=('!strip')
-_commit=a1b268fd04791a1f54e2e1a11af527e6c0743f25
+_commit=2f4e1c85cbb3cb20677784f9f3e1ad121faead5a
 source=("https://github.com/hardkernel/linux/archive/${_commit}.tar.gz"
         'config_x'
         'config_x2'
         'config_u2')
-md5sums=('7c06316f8c9b3e83cd7d497ce0bc8b13'
-         'df43214e203b75fab1b25ae416db1d98'
-         'c6d0851078ffc7f8b7da903ca806f3c4'
-         '83456433ead1b5f5ca15fe55f5c906b4')
+md5sums=('930b4a5026be653926a899672b6342ac'
+         '566092b25c4ccdbe712dcfc944bbbd03'
+         '893db8bc80fec4d94062e86c14240d21'
+         '5140da2d874bb083923d15a851484d05')
 
 prepare() {
   cd "${srcdir}/linux-${_commit}"
diff --git a/core/linux-odroid/config_u2 b/core/linux-odroid/config_u2
index 42de3cafc..efca8acf8 100644
--- a/core/linux-odroid/config_u2
+++ b/core/linux-odroid/config_u2
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.8.13.21 Kernel Configuration
+# Linux/arm 3.8.13.21-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1566,7 +1566,8 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_DEBUG=y
 CONFIG_RTL8192C_COMMON=m
-# CONFIG_RTL8192CU_V40 is not set
+CONFIG_RTL8192CU_V40=m
+CONFIG_RTL8812AU=m
 # CONFIG_WL_TI is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2325,7 +2326,7 @@ CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=y
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 
@@ -3497,7 +3498,6 @@ CONFIG_AUFS_HNOTIFY=y
 CONFIG_AUFS_HFSNOTIFY=y
 CONFIG_AUFS_EXPORT=y
 CONFIG_AUFS_RDU=y
-CONFIG_AUFS_PROC_MAP=y
 CONFIG_AUFS_SP_IATTR=y
 CONFIG_AUFS_SHWH=y
 CONFIG_AUFS_BR_RAMFS=y
diff --git a/core/linux-odroid/config_x b/core/linux-odroid/config_x
index 6bfb5f45a..8f1f0ef3a 100644
--- a/core/linux-odroid/config_x
+++ b/core/linux-odroid/config_x
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.8.13.21 Kernel Configuration
+# Linux/arm 3.8.13.21-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1566,7 +1566,8 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_DEBUG=y
 CONFIG_RTL8192C_COMMON=m
-# CONFIG_RTL8192CU_V40 is not set
+CONFIG_RTL8192CU_V40=m
+CONFIG_RTL8812AU=m
 # CONFIG_WL_TI is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2332,7 +2333,7 @@ CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=y
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 
@@ -3503,7 +3504,6 @@ CONFIG_AUFS_HNOTIFY=y
 CONFIG_AUFS_HFSNOTIFY=y
 CONFIG_AUFS_EXPORT=y
 CONFIG_AUFS_RDU=y
-CONFIG_AUFS_PROC_MAP=y
 CONFIG_AUFS_SP_IATTR=y
 CONFIG_AUFS_SHWH=y
 CONFIG_AUFS_BR_RAMFS=y
diff --git a/core/linux-odroid/config_x2 b/core/linux-odroid/config_x2
index 1f228ef7d..608b054ee 100644
--- a/core/linux-odroid/config_x2
+++ b/core/linux-odroid/config_x2
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.8.13.21 Kernel Configuration
+# Linux/arm 3.8.13.21-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1566,7 +1566,8 @@ CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_DEBUG=y
 CONFIG_RTL8192C_COMMON=m
-# CONFIG_RTL8192CU_V40 is not set
+CONFIG_RTL8192CU_V40=m
+CONFIG_RTL8812AU=m
 # CONFIG_WL_TI is not set
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
@@ -2332,7 +2333,7 @@ CONFIG_VIDEO_EXYNOS_FIMC_LITE=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_DEINTERLACE=y
 # CONFIG_VIDEO_SAMSUNG_S5P_G2D is not set
-# CONFIG_VIDEO_SAMSUNG_S5P_JPEG is not set
+CONFIG_VIDEO_SAMSUNG_S5P_JPEG=y
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=y
 # CONFIG_V4L_TEST_DRIVERS is not set
 
@@ -3503,7 +3504,6 @@ CONFIG_AUFS_HNOTIFY=y
 CONFIG_AUFS_HFSNOTIFY=y
 CONFIG_AUFS_EXPORT=y
 CONFIG_AUFS_RDU=y
-CONFIG_AUFS_PROC_MAP=y
 CONFIG_AUFS_SP_IATTR=y
 CONFIG_AUFS_SHWH=y
 CONFIG_AUFS_BR_RAMFS=y