diff --git a/patch/kernel/cubox-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch b/patch/kernel/cubox-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
index a524864e18..02d8d801bf 100644
--- a/patch/kernel/cubox-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
+++ b/patch/kernel/cubox-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
@@ -129,7 +129,7 @@ index 152d4d2..9b30ad2 100644
  
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
 +	mkdir -p "$tmpdir/boot/dtb-""$version"
-+   cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
++   cp $objtree/arch/$SRCARCH/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
 +	#INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
 +fi
 +
diff --git a/patch/kernel/cubox-dev/packaging-3.14-DEV-with-postinstall-scripts.patch b/patch/kernel/cubox-dev/packaging-3.14-DEV-with-postinstall-scripts.patch
index 949c2ee312..51326cd50b 100644
--- a/patch/kernel/cubox-dev/packaging-3.14-DEV-with-postinstall-scripts.patch
+++ b/patch/kernel/cubox-dev/packaging-3.14-DEV-with-postinstall-scripts.patch
@@ -129,7 +129,7 @@ index 152d4d2..9b30ad2 100644
  
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
 +	mkdir -p "$tmpdir/boot/dtb-""$version"
-+   cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
++   cp $objtree/arch/$SRCARCH/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
 +	#INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
 +fi
 +
diff --git a/patch/kernel/neo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch b/patch/kernel/neo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
index a524864e18..02d8d801bf 100644
--- a/patch/kernel/neo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
+++ b/patch/kernel/neo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
@@ -129,7 +129,7 @@ index 152d4d2..9b30ad2 100644
  
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
 +	mkdir -p "$tmpdir/boot/dtb-""$version"
-+   cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
++   cp $objtree/arch/$SRCARCH/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
 +	#INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
 +fi
 +
diff --git a/patch/kernel/odroidc2-default/02-packagin-odroidc2.patch b/patch/kernel/odroidc2-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
similarity index 73%
rename from patch/kernel/odroidc2-default/02-packagin-odroidc2.patch
rename to patch/kernel/odroidc2-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
index cfd85b1f00..02d8d801bf 100644
--- a/patch/kernel/odroidc2-default/02-packagin-odroidc2.patch
+++ b/patch/kernel/odroidc2-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
@@ -1,5 +1,5 @@
 diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 152d4d2..9c44f70 100644
+index 152d4d2..9b30ad2 100644
 --- a/scripts/package/builddeb
 +++ b/scripts/package/builddeb
 @@ -35,13 +35,15 @@ create_package() {
@@ -20,16 +20,39 @@ index 152d4d2..9c44f70 100644
  	arm*)
  		debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el || true) ;;
  	*)
-@@ -62,7 +64,7 @@ create_package() {
+@@ -61,8 +63,30 @@ create_package() {
+ 		forcearch="-DArchitecture=$debarch"
  	fi
  
++	# Create preinstall and post install script to remove dtb
++	if [[ "$1" == *dtb* ]]; then
++		echo "if [ -d /boot/dtb ]; then rm -rf /boot/dtb; fi" >> $pdir/DEBIAN/preinst
++		echo "if [ -d /boot/dtb-$version ]; then rm -rf /boot/dtb-$version; fi" >> $pdir/DEBIAN/preinst
++		echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/preinst
++		echo "if [ -d /dtb ]; then rm -rf /dtb; fi" >> $pdir/DEBIAN/preinst
++		echo "exit 0" >> $pdir/DEBIAN/preinst
++		chmod 775 $pdir/DEBIAN/preinst
++		#
++		echo "if [ -d /boot/dtb.old ]; then rm -rf /boot/dtb.old; fi" >> $pdir/DEBIAN/postinst
++		echo "ln -sf dtb-$version /boot/dtb > /dev/null 2>&1 || mv /boot/dtb-$version /boot/dtb" >> $pdir/DEBIAN/postinst
++		echo "exit 0" >> $pdir/DEBIAN/postinst
++		chmod 775 $pdir/DEBIAN/postinst
++	fi
++	
++	# Create postinstall script for headers
++	if [[ "$1" == *headers* ]]; then
++		echo "cd /usr/src/linux-headers-$version; echo \"Compiling headers - please wait ...\"; make -s scripts >/dev/null 2>&1" >> $pdir/DEBIAN/postinst
++		echo "exit 0" >> $pdir/DEBIAN/postinst
++		chmod 775 $pdir/DEBIAN/postinst
++	fi
++	
  	# Create the package
 -	dpkg-gencontrol -isp $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
 +	dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch:-$(dpkg --print-architecture)}" -p$pname -P"$pdir"
  	dpkg --build "$pdir" ..
  }
  
-@@ -78,11 +80,13 @@ tmpdir="$objtree/debian/tmp"
+@@ -78,11 +102,13 @@ tmpdir="$objtree/debian/tmp"
  fwdir="$objtree/debian/fwtmp"
  kernel_headers_dir="$objtree/debian/hdrtmp"
  libc_headers_dir="$objtree/debian/headertmp"
@@ -47,7 +70,7 @@ index 152d4d2..9c44f70 100644
  dbg_packagename=$packagename-dbg
  
  if [ "$ARCH" = "um" ] ; then
-@@ -106,13 +110,17 @@ esac
+@@ -106,13 +132,17 @@ esac
  BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
  
  # Setup the directory structure
@@ -61,12 +84,12 @@ index 152d4d2..9c44f70 100644
  mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
 +
 +mkdir -m 755 -p "$dtb_dir/DEBIAN"
-+mkdir -p "$dtb_dir/boot/dtb" "$dtb_dir/usr/share/doc/$dtb_packagename"
++mkdir -p "$dtb_dir/boot/dtb-$version" "$dtb_dir/usr/share/doc/$dtb_packagename"
 +
  mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
  mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
  mkdir -p "$kernel_headers_dir/lib/modules/$version/"
-@@ -130,16 +138,17 @@ if [ "$ARCH" = "um" ] ; then
+@@ -130,7 +160,7 @@ if [ "$ARCH" = "um" ] ; then
  	cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
  	cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
  	gzip "$tmpdir/usr/share/doc/$packagename/config"
@@ -75,22 +98,7 @@ index 152d4d2..9c44f70 100644
  	cp System.map "$tmpdir/boot/System.map-$version"
  	cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
  fi
- # Not all arches include the boot path in KBUILD_IMAGE
--if [ -e $KBUILD_IMAGE ]; then
--	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
--else
--	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
--fi
-+#if [ -e $KBUILD_IMAGE ]; then
-+
-+#	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
-+#else
-+	cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
-+#fi
- 
- if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
- 	INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
-@@ -150,21 +159,25 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
+@@ -150,21 +180,25 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
  		rmdir "$tmpdir/lib/modules/$version"
  	fi
  	if [ -n "$BUILD_DEBUG" ] ; then
@@ -120,15 +128,15 @@ index 152d4d2..9c44f70 100644
  fi
  
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
-+	mkdir -p "$tmpdir/boot/dtb"
-+   cp $objtree/arch/$ARCH/boot/dts/*.dtb $dtb_dir/boot/dtb
++	mkdir -p "$tmpdir/boot/dtb-""$version"
++   cp $objtree/arch/$SRCARCH/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
 +	#INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
 +fi
 +
  if [ "$ARCH" != "um" ]; then
  	$MAKE headers_check KBUILD_SRC=
  	$MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
-@@ -189,9 +202,11 @@ for script in postinst postrm preinst prerm ; do
+@@ -189,9 +223,11 @@ for script in postinst postrm preinst prerm ; do
  set -e
  
  # Pass maintainer script parameters to hook scripts
@@ -140,7 +148,7 @@ index 152d4d2..9c44f70 100644
  export INITRD=$want_initrd
  
  test -d $debhookdir/$script.d && run-parts --arg="$version" --arg="/$installed_image_path" $debhookdir/$script.d
-@@ -200,6 +215,19 @@ EOF
+@@ -200,6 +236,51 @@ EOF
  	chmod 755 "$tmpdir/DEBIAN/$script"
  done
  
@@ -148,19 +156,51 @@ index 152d4d2..9c44f70 100644
 +## Create sym link to kernel image
 +##
 +kernel_tmp_version="${installed_image_path////\\/}"
-+sed -e "s#exit 0#ln -sf $(basename $kernel_tmp_version) /boot/Image >/dev/null 2>&1 || mv /$kernel_tmp_version /boot/Image#g" -i $tmpdir/DEBIAN/postinst
-+echo "update-initramfs -c -t -k $version >/dev/null 2>&1" >> $tmpdir/DEBIAN/postinst 
-+echo "mkimage -A $UTS_MACHINE -O linux -T ramdisk -C none -a 0 -e 0 -n uInitrd -d /boot/initrd.img-$version /boot/uInitrd >/dev/null 2>&1" >> $tmpdir/DEBIAN/postinst 
-+echo "rm /boot/initrd.img-$version" >> $tmpdir/DEBIAN/postinst 
-+#echo "touch /boot/.next" >> $tmpdir/DEBIAN/postinst 
-+echo "exit 0" >> $tmpdir/DEBIAN/postinst
++sed -e "s/set -e//g" -i $tmpdir/DEBIAN/postinst
++sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst
++cat >> $tmpdir/DEBIAN/postinst <<EOT 
++ln -sf $(basename $kernel_tmp_version) /boot/zImage > /dev/null 2>&1 || mv /$kernel_tmp_version /boot/zImage
 +
-+sed -e "s#exit 0#rm -f /boot/config-$version /boot/System.map-$version#g" -i $tmpdir/DEBIAN/preinst
++if [ -f "/boot/initrd.img-$version" ]; then 
++mkimage -A $UTS_MACHINE -O linux -T ramdisk -C gzip -a 0 -e 0 -n uInitrd -d /boot/initrd.img-$version /boot/uInitrd > /dev/null 2>&1
++rm /boot/initrd.img-$version
++fi
++exit 0
++EOT
++
++##
++## FAT install workaround
++##
++sed -e "s/set -e//g" -i $tmpdir/DEBIAN/preinst
++sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/preinst
++cat >> $tmpdir/DEBIAN/preinst <<EOT 
++# exit if we are running chroot
++if [ "\$(stat -c %d:%i /)" != "\$(stat -c %d:%i /proc/1/root/.)" ]; then exit 0; fi
++
++check_and_unmount (){
++boot_device=\$(mountpoint -d /boot)
++
++for file in /dev/* ; do
++	CURRENT_DEVICE=\$(printf "%d:%d" \$(stat --printf="0x%t 0x%T" \$file))
++	if [ \$CURRENT_DEVICE = \$boot_device ]; then
++		boot_partition=\$file
++		break;
++	fi
++done
++
++bootfstype=\$(blkid -s TYPE -o value \$boot_partition)
++if [ "\$bootfstype" = "vfat" ]; then 
++rm -f /boot/System.map* /boot/config* /boot/vmlinuz* /boot/zImage /boot/uImage /boot/*nitrd*
++fi
++}
++mountpoint -q /boot && check_and_unmount
++EOT
++echo "exit 0" >> $tmpdir/DEBIAN/preinst 
 +
  # Try to determine maintainer and email values
  if [ -n "$DEBEMAIL" ]; then
         email=$DEBEMAIL
-@@ -217,9 +245,20 @@ else
+@@ -217,9 +298,20 @@ else
  fi
  maintainer="$name <$email>"
  
@@ -182,7 +222,7 @@ index 152d4d2..9c44f70 100644
  
    * Custom built Linux kernel.
  
-@@ -233,10 +272,10 @@ This is a packacked upstream version of the Linux kernel.
+@@ -233,10 +325,10 @@ This is a packacked upstream version of the Linux kernel.
  The sources may be found at most Linux ftp sites, including:
  ftp://ftp.kernel.org/pub/linux/kernel
  
@@ -195,7 +235,7 @@ index 152d4d2..9c44f70 100644
  
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
-@@ -287,22 +326,32 @@ EOF
+@@ -287,22 +379,32 @@ EOF
  
  fi
  
@@ -215,7 +255,7 @@ index 152d4d2..9c44f70 100644
 -(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
 +######################## headers patch
 +ZACNI=$(pwd)
-+cd $destdir 
++cd $destdir
 +patch -p1 < /tmp/headers-debian-byteshift.patch
 +cd $ZACNI
 +######################## headers patch
@@ -235,7 +275,7 @@ index 152d4d2..9c44f70 100644
  Architecture: any
  Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
   This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
-@@ -328,6 +377,16 @@ fi
+@@ -328,6 +430,16 @@ fi
  
  cat <<EOF >> debian/control
  
@@ -252,7 +292,7 @@ index 152d4d2..9c44f70 100644
  Package: $libc_headers_packagename
  Section: devel
  Provides: linux-kernel-headers
-@@ -339,7 +398,7 @@ EOF
+@@ -339,7 +451,7 @@ EOF
  
  if [ "$ARCH" != "um" ]; then
  	create_package "$kernel_headers_packagename" "$kernel_headers_dir"
diff --git a/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch b/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
index a524864e18..02d8d801bf 100644
--- a/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
+++ b/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch
@@ -129,7 +129,7 @@ index 152d4d2..9b30ad2 100644
  
 +if grep -q '^CONFIG_OF=y' $KCONFIG_CONFIG ; then
 +	mkdir -p "$tmpdir/boot/dtb-""$version"
-+   cp $objtree/arch/arm/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
++   cp $objtree/arch/$SRCARCH/boot/dts/*.dtb $dtb_dir/boot/dtb-$version
 +	#INSTALL_DTBS_PATH="$dtb_dir/boot/dtb" $MAKE KBUILD_SRC= dtbs_install
 +fi
 +