diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 682f12918..9299f7a30 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-armv7
 _srcname=linux-3.18
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=3.18.1
+pkgver=3.18.2
 pkgrel=1
 rcnrel=armv7-x2
 arch=('armv7h')
@@ -18,25 +18,23 @@ 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://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=aufs${pkgver%.*}.1+" # 3.18.1+
         #"git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
         '0004-fix-mvsdio-eMMC-timing.patch'
         '0005-mmc-mvsdio-Work-around-broken-TX-DMA.patch' 
-        '0001-AUFS-fix-for-3.18.1.patch'
         'config')
 md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
-         '82864000fde42252dd5e80cceb971479'
-         'dbbb7115cbf9c11e4087d97f8eb2799a'
+         'f99d6d8f844a3fe1ab7f59dd85aaa050'
+         '3dede0a299b25df9d0ce77df302a30b8'
          'SKIP'
          '71c2bfdde7cdefb5788aac9d3dc3e35d'
          '9ba8dec6e78de09a0b0ac50d386a9c46'
          '0586896c14824b5e988597617f923f5e'
          'fc1cd549e20f3cf49d7b0af8b01cc900'
          '1c45963a5bfcb535864a86139346217d'
-         'aa83d1bca3a3583aa4011d03ff23bfd5'
          'fe77781fcc6a50e59745b31098a84c1f')
 
 prepare() {
@@ -66,9 +64,6 @@ prepare() {
   git apply ../aufs3-standalone/aufs3-mmap.patch
   git apply ../aufs3-standalone/aufs3-standalone.patch
 
-  # Fix until patched upstream
-  git apply ../0001-AUFS-fix-for-3.18.1.patch
-
   cat "${srcdir}/config" > ./.config
 
   # add pkgrel to extraversion
@@ -114,7 +109,7 @@ _package() {
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=${pkgver}" 'aufs_friendly')
   conflicts=('linux')
-  replaces=('linux-mvebu')
+  replaces=('linux-mvebu' 'linux-udoo')
   install=${pkgname}.install
 
   cd "${srcdir}/${_srcname}"
@@ -280,7 +275,8 @@ _package-headers() {
 _package-smileplug() {
   pkgdesc="The Linux Kernel - ${_desc} - Marvell SMILE Plug"
   depends=('linux-armv7')
-  conflicts=('linux-armv7-mirabox' 'linux-armv7-ax3' 'linux-armv7-d3plug' 'linux-armv7-cubox')
+  provides=('linux-armv7-uimage')
+  conflicts=('linux-armv7-uimage')
   replaces=('linux-mvebu-smileplug')
 
   cd "${srcdir}/${_srcname}"
@@ -293,7 +289,8 @@ _package-smileplug() {
 _package-mirabox() {
   pkgdesc="The Linux Kernel - ${_desc} - Globalscale Mirabox"
   depends=('linux-armv7')
-  conflicts=('linux-armv7-smileplug' 'linux-armv7-ax3' 'linux-armv7-d3plug' 'linux-armv7-cubox')
+  provides=('linux-armv7-uimage')
+  conflicts=('linux-armv7-uimage')
   replaces=('linux-mvebu-mirabox')
 
   cd "${srcdir}/${_srcname}"
@@ -306,7 +303,8 @@ _package-mirabox() {
 _package-ax3() {
   pkgdesc="The Linux Kernel - ${_desc} - OpenBlocks AX3-4"
   depends=('linux-armv7')
-  conflicts=('linux-armv7-mirabox' 'linux-armv7-smileplug' 'linux-armv7-d3plug' 'linux-armv7-cubox')
+  provides=('linux-armv7-uimage')
+  conflicts=('linux-armv7-uimage')
   replaces=('linux-mvebu-ax3')
 
   cd "${srcdir}/${_srcname}"
@@ -319,7 +317,8 @@ _package-ax3() {
 _package-d3plug() {
   pkgdesc="The Linux Kernel - ${_desc} - Globalscale D3Plug"
   depends=('linux-armv7')
-  conflicts=('linux-armv7-mirabox' 'linux-armv7-smileplug' 'linux-armv7-ax3' 'linux-armv7-cubox')
+  provides=('linux-armv7-uimage')
+  conflicts=('linux-armv7-uimage')
   #replaces=('linux-d3plug')
 
   cd "${srcdir}/${_srcname}"
@@ -332,7 +331,8 @@ _package-d3plug() {
 _package-cubox() {
   pkgdesc="The Linux Kernel - ${_desc} - SolidRun Cubox (Marvell)"
   depends=('linux-armv7')
-  conflicts=('linux-armv7-mirabox' 'linux-armv7-smileplug' 'linux-armv7-ax3' 'linux-armv7-d3plug')
+  provides=('linux-armv7-uimage')
+  conflicts=('linux-armv7-uimage')
   #replaces=('linux-cubox')
 
   cd "${srcdir}/${_srcname}"