diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh
index 453b999..2bcf331 100644
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+conf_smart_uboot="smart_DISABLED"
+
 if [ ! -f /var/log/netinstall.log ] ; then
 	touch /var/log/netinstall.log
 	echo "NetInstall Log:" >> /var/log/netinstall.log
@@ -183,9 +185,11 @@ fi
 echo "uname_r=$(uname -r)" > /boot/uEnv.txt
 echo "uuid=$(/sbin/blkid -c /dev/null -s UUID -o value ${FINAL_PART})" >> /boot/uEnv.txt
 
-rootdrive=$(echo ${FINAL_PART} | awk -F"p" '{print $1}' || true)
-if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
-	mv /boot/uboot/uEnv.txt /boot/uboot/disabled-uEnv.txt
+if [ "x${conf_smart_uboot}" = "xenable" ] ; then
+	rootdrive=$(echo ${FINAL_PART} | awk -F"p" '{print $1}' || true)
+	if [ "x${bootdrive}" = "x${rootdrive}" ] ; then
+		mv /boot/uboot/uEnv.txt /boot/uboot/disabled-uEnv.txt
+	fi
 fi
 
 #
diff --git a/lib/distro.conf b/lib/distro.conf
index 700c9d1..e1d61f6 100755
--- a/lib/distro.conf
+++ b/lib/distro.conf
@@ -41,6 +41,7 @@ wheezy-armhf-netboot)
 	BASE_IMAGE="mx5/netboot/efikamx"
 	UBOOTWRAPPER=1
 	NETINSTALL="uInitrd"
+	rcn_ee_repo="enable"
 	;;
 jessie-armhf-netboot)
 	#08-Feb-2014
diff --git a/lib/wheezy-preseed.cfg b/lib/wheezy-preseed.cfg
index fe22ff9..934a293 100644
--- a/lib/wheezy-preseed.cfg
+++ b/lib/wheezy-preseed.cfg
@@ -15,6 +15,22 @@ d-i base-installer/kernel/skip-install boolean true
 # Continue the install without loading kernel modules?
 d-i anna/no_kernel_modules boolean true
 
+# Additional repositories, local[0-9] available
+#d-i apt-setup/local0/repository string \
+#       http://local.server/debian stable main
+#d-i apt-setup/local0/comment string local server
+# Enable deb-src lines
+#d-i apt-setup/local0/source boolean true
+# URL to the public key of the local repository; you must provide a key or
+# apt will complain about the unauthenticated repository and so the
+# sources.list line will be left commented out
+#d-i apt-setup/local0/key string http://local.server/key
+
+d-i apt-setup/local0/repository string http://repos.rcn-ee.net/debian/ wheezy main
+
+#apt-cacher-ng allows "custom.gpg"
+d-i apt-setup/local0/key string http://repos.rcn-ee.net/debian/conf/custom.gpg
+
 # Controls whether to use NTP to set the clock during the install
 d-i clock-setup/ntp boolean true
 # NTP server to use. The default is almost always fine here.
diff --git a/mk_mmc.sh b/mk_mmc.sh
index 1e716fd..457f517 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -938,6 +938,9 @@ initrd_preseed_settings () {
 		;;
 	wheezy|jessie)
 		cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
+		if [ "x${conf_smart_uboot}" = "xenable" ] ; then
+			sed -i -e 's:smart_DISABLED:enable:g' ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
+		fi
 		;;
 	esac
 
@@ -953,6 +956,8 @@ initrd_preseed_settings () {
 			sed -i -e 's:#d-i debian-installer:d-i debian-installer:g' ${TEMPDIR}/initrd-tree/preseed.cfg
 			sed -i -e 's:#d-i console-keymaps-at:d-i console-keymaps-at:g' ${TEMPDIR}/initrd-tree/preseed.cfg
 		fi
+		sed -i -e 's:initramfs-tools:initramfs-tools '$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg
+		cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image
 		;;
 	jessie)
 		sed -i -e 's:initramfs-tools:initramfs-tools '$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg