diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD
index 4916804a0..c83efe2c1 100644
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@@ -6,10 +6,10 @@ buildarch=2
 pkgbase=linux-kirkwood
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
-pkgver=3.18.1
+pkgver=3.18.3
 pkgrel=1
 cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239
-bfqver=v7r6
+bfqver=v7r7
 
 arch=('arm')
 url="http://www.kernel.org/"
@@ -23,26 +23,24 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'usb-add-reset-resume-quirk-for-several-webcams.patch'
 	'0001-disable-mv643xx_eth-TSO.patch'
-        "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:0:4}"
-        '0001-AUFS-fix-for-3.18.1.patch'
+#        "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:0:4}.1+"
         'cryptodev.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz'
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch")
 
-md5sums=('79c9b73a01e1dce0a4c28828496ef02c'
+md5sums=('7f37f59b9f01945c9503bc9deed88820'
          'adae431c969e3fcf32aa8c315c96e02a'
          'fad0103ae663d6bacb922628f6d26fa7'
          'df25fccf87d246f97dac2843e22debe6'
          '9b5a265440abf57d2052838f31486a3a'
          '09d44b9f07abfaeaf4f688ee52034786'
          'SKIP'
-         'aa83d1bca3a3583aa4011d03ff23bfd5'
          'ddf7876487c876f6676ef0e050e9d204'
-         'f84f5f809a0f92e5e469d7c9e2dbac58'
-         '22ef862652608c8d6b07536e990d4bcb'
-         'b031b1aafd416453d1c8579bd6823fca')
+         '1c7c2d0338939a9e6953a64d80861471'
+         'a81346cce95baeac2c56cf60d3c7e5b6'
+         '8f2743651280f5a022e541f4e95e5546')
 
 prepare() {
   cd "${srcdir}/linux-${pkgver}"
@@ -56,8 +54,6 @@ msg2 "Applying aufs3 patches"
   patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
   patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
   patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
-  # Remove when updated upstream
-  patch -Np1 -i ../0001-AUFS-fix-for-3.18.1.patch
 
 msg2 "Disable buggy TCP segmentation offload implementation"
 msg2 "http://archlinuxarm.org/forum/viewtopic.php?f=9&t=7692"
diff --git a/core/linux-kirkwood/linux-kirkwood.install b/core/linux-kirkwood/linux-kirkwood.install
index 2c7d36770..b8392e29a 100644
--- a/core/linux-kirkwood/linux-kirkwood.install
+++ b/core/linux-kirkwood/linux-kirkwood.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=3.18.1-1-ARCH
+KERNEL_VERSION=3.18.3-1-ARCH
 
 post_install () {
   # updating module dependencies