diff --git a/core/linux-odroid-x2/PKGBUILD b/core/linux-odroid-x2/PKGBUILD
index 07e6ce199..cfd66936e 100644
--- a/core/linux-odroid-x2/PKGBUILD
+++ b/core/linux-odroid-x2/PKGBUILD
@@ -7,11 +7,11 @@
 buildarch=4
 
 pkgbase=linux-odroid-x2
-pkgname=('linux-odroid-x2')
+pkgname=('linux-odroid-x2' 'linux-headers-odroid-x2')
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux}
 _basekernel=3.0
-pkgver=${_basekernel}.58
+pkgver=${_basekernel}.60
 pkgrel=1
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -112,7 +112,7 @@ package_linux-odroid-x2() {
   # remove the firmware
   rm -rf "${pkgdir}/lib/firmware"
   # gzip -9 all modules to save 100MB of space
-  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  find "${pkgdir}" -name '*.ko' |xargs -P 2 -n 1 gzip -9
   # make room for external modules
   ln -s "../extramodules-${_basekernel}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
@@ -209,10 +209,6 @@ package_linux-headers-odroid-x2() {
   # http://bugs.archlinux.org/task/9912
   mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
   cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
-  # and...
-  # http://bugs.archlinux.org/task/11194
-  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
-  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
 
   # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
   # in reference to: