diff --git a/core/linux-mmp/PKGBUILD b/core/linux-mmp/PKGBUILD
index 7ee05b161..30e28c5cb 100644
--- a/core/linux-mmp/PKGBUILD
+++ b/core/linux-mmp/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-mmp
 _srcname=linux-3.18
 _kernelname=${pkgbase#linux}
 _desc="Marvell PXA168/MMP platforms"
-pkgver=3.18.57
+pkgver=3.18.58
 pkgrel=1
 arch=('arm')
 url="https://github.com/Marvell-Semi/PXA168_kernel/tree/gplugd-dev"
@@ -15,7 +15,9 @@ 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"
+        'https://cdn.kernel.org/pub/linux/kernel/v3.x/patch-3.18.57.xz'
+        'https://cdn.kernel.org/pub/linux/kernel/v3.x/incr/patch-3.18.57-58.xz'
         '0001-clk-mmp-Adding-clocks-of-pxa168-peripherals-for-gplu.patch'
         '0002-arch-arm-mmp-initialize-gpio-driver-before-other-dri.patch'
         '0003-arch-arm-mmp-Adding-spi-master-and-mtd-dataflash-for.patch'
@@ -27,6 +29,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         'config')
 md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
          '9f9e57dd7f8614e86edcee51e2529b3a'
+         '02dcf1fc37d0cbf65994c279fcaebadb'
          'a862b5c347732e805e783f9c91c42a1b'
          '9f8a35ab6d94fde54316f6b6d5c7c0d5'
          '19cdd5b19a776324bf090ca5f9751191'
@@ -41,7 +44,9 @@ prepare() {
   cd "${srcdir}/${_srcname}"
 
   # upstream patch
-  git apply --whitespace=nowarn ../patch-${pkgver}
+  #git apply --whitespace=nowarn ../patch-${pkgver}
+  git apply --whitespace=nowarn ../patch-3.18.57
+  git apply --whitespace=nowarn ../patch-3.18.57-58
 
   # gplugd patch
   git apply ../0001-clk-mmp-Adding-clocks-of-pxa168-peripherals-for-gplu.patch