diff --git a/mk_mmc.sh b/mk_mmc.sh
index 8d4911d..3a37b56 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -733,10 +733,6 @@ function setup_bootscripts {
  sed -i -e 's:SERIAL:'$SERIAL':g' "${DIR}/scripts/ubuntu-tweaks.diff"
  sed -i -e 's:SERIAL:'$SERIAL':g' "${DIR}/scripts/debian-tweaks.diff"
 
-	#Setup Kernel Boot Address
-	sed -i -e 's:load_addr:'$load_addr':g' "${DIR}/scripts/ubuntu-finish.sh"
-	sed -i -e 's:load_addr:'$load_addr':g' "${DIR}/scripts/debian-finish.sh"
-
  if [ "$SMSC95XX_MOREMEM" ];then
   sed -i 's/8192/16384/g' "${DIR}/scripts/ubuntu-tweaks.diff"
   sed -i 's/8192/16384/g' "${DIR}/scripts/debian-tweaks.diff"
@@ -1386,10 +1382,6 @@ function reset_scripts {
  sed -i -e 's:'$SERIAL':SERIAL:g' "${DIR}/scripts/ubuntu-tweaks.diff"
  sed -i -e 's:'$SERIAL':SERIAL:g' "${DIR}/scripts/debian-tweaks.diff"
 
-	#Setup Kernel Boot Address
-	sed -i -e 's:'$load_addr':load_addr:g' "${DIR}/scripts/ubuntu-finish.sh"
-	sed -i -e 's:'$load_addr':load_addr:g' "${DIR}/scripts/debian-finish.sh"
-
  if [ "$SMSC95XX_MOREMEM" ];then
   sed -i 's/16384/8192/g' "${DIR}/scripts/ubuntu-tweaks.diff"
   sed -i 's/16384/8192/g' "${DIR}/scripts/debian-tweaks.diff"
diff --git a/scripts/debian-finish.sh b/scripts/debian-finish.sh
index 69c5fa6..44905ce 100644
--- a/scripts/debian-finish.sh
+++ b/scripts/debian-finish.sh
@@ -30,8 +30,10 @@ fi
 #Install Correct Kernel Image:
 dpkg -x /boot/uboot/linux-image-*_1.0*_arm*.deb /
 update-initramfs -c -k `uname -r`
+
 mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
-mkimage -A arm -O linux -T kernel -C none -a load_addr -e load_addr -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
+load_addr=$(cat /boot/uboot/SOC.sh | grep load_addr | awk -F"=" '{print $2}')
+mkimage -A arm -O linux -T kernel -C none -a ${load_addr} -e ${load_addr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
 
 cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage
 cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img
diff --git a/scripts/ubuntu-finish.sh b/scripts/ubuntu-finish.sh
index f2195c7..8bb9a69 100644
--- a/scripts/ubuntu-finish.sh
+++ b/scripts/ubuntu-finish.sh
@@ -68,8 +68,10 @@ apt-get -y autoremove || true
 #Install Correct Kernel Image:
 dpkg -x /boot/uboot/linux-image-*_1.0*_arm*.deb /
 update-initramfs -c -k `uname -r`
+
 mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
-mkimage -A arm -O linux -T kernel -C none -a load_addr -e load_addr -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
+load_addr=$(cat /boot/uboot/SOC.sh | grep load_addr | awk -F"=" '{print $2}')
+mkimage -A arm -O linux -T kernel -C none -a ${load_addr} -e ${load_addr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
 
 cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage
 cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img