diff --git a/core/kernel26-olinuxino/PKGBUILD b/core/kernel26-olinuxino/PKGBUILD
index 2928d985c..2b9c0b5c7 100644
--- a/core/kernel26-olinuxino/PKGBUILD
+++ b/core/kernel26-olinuxino/PKGBUILD
@@ -175,8 +175,10 @@ package_kernel26-olinuxino() {
   
   # get kernel version
   _kernver="$(make kernelrelease)"
-  mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
-  make INSTALL_MOD_PATH=${pkgdir} modules_install
+
+  # Install zImage, System.map and the config for reference
+  mkdir -p ${pkgdir}/{usr/lib/modules,usr/lib/firmware,boot}
+  make INSTALL_MOD_PATH=${pkgdir}/usr modules_install
   #cp arch/$KARCH/boot/uImage ${pkgdir}/boot/uImage
   cp arch/$KARCH/boot/zImage ${pkgdir}/boot/zImage
   cp .config ${pkgdir}/boot/config-${_kernver}
@@ -194,7 +196,7 @@ package_kernel26-olinuxino() {
   elftosb -z -c ./imx-bootlets-olinuxino/linux.bd -o ${pkgdir}/boot/oli-${_kernver}.sb
 
   # remove build and source links
-  rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
+  rm -f ${pkgdir}/usr/lib/modules/${_kernver}/{source,build}
 }
 
 package_kernel26-headers-olinuxino() {