diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD
index 60041f4e1..ec1d363e4 100644
--- a/core/linux-am33x/PKGBUILD
+++ b/core/linux-am33x/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-am33x
 _srcname=linux-3.18
 _kernelname=${pkgbase#linux}
 _desc="TI AM335x Beaglebone (Black)"
-pkgver=3.18.0
+pkgver=3.18.1
 pkgrel=1
 rcnrel=bone1
 arch=('armv7h')
@@ -16,21 +16,22 @@ 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"
-        #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         "http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
-        #"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
-        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
+        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver%.*}"
+        #"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
         'config')
 md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
-         'f9e8aff0788390585dd5347ece7b7f79'
+         '82864000fde42252dd5e80cceb971479'
+         '46ce48685ed5cd57ad8b81715aa9b31b'
          'SKIP'
-         '0e3c0068228dc9d961f3e57164071ff1')
+         'cdca1e95ac460aa6d8fb04c5c99e9238')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  #git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
+  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
   # ALARM patches
   git apply "${srcdir}/patch-${pkgver%.0}-${rcnrel}.diff"
diff --git a/core/linux-am33x/config b/core/linux-am33x/config
index e902c87b9..324b484c3 100644
--- a/core/linux-am33x/config
+++ b/core/linux-am33x/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.0-1 Kernel Configuration
+# Linux/arm 3.18.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1271,7 +1271,8 @@ CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_SJA1000_ISA=m
 # CONFIG_CAN_SJA1000_PLATFORM is not set
-# CONFIG_CAN_C_CAN is not set
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
 # CONFIG_CAN_M_CAN is not set
 # CONFIG_CAN_CC770 is not set
 
@@ -1887,7 +1888,7 @@ CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DAVINCI_CPDMA=y
 CONFIG_TI_CPSW_PHY_SEL=y
 CONFIG_TI_CPSW=y
-# CONFIG_TI_CPTS is not set
+CONFIG_TI_CPTS=y
 CONFIG_NET_VENDOR_VIA=y
 # CONFIG_VIA_RHINE is not set
 # CONFIG_VIA_VELOCITY is not set
@@ -3880,8 +3881,8 @@ CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_LENOVO=m
-CONFIG_HID_LOGITECH=m
-CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH=y
+CONFIG_HID_LOGITECH_DJ=y
 CONFIG_LOGITECH_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y