diff --git a/README b/README
index ec1de40..1da6f4b 100644
--- a/README
+++ b/README
@@ -39,6 +39,7 @@ Optional:
                 precise-armhf (12.04) (armv7-a)
                 quantal (12.10) (armv7-a)
                 raring (13.04) (armv7-a)
+                saucy (13.10) (armv7-a) (beta)
 
 --addon <additional peripheral device>
         pico
diff --git a/hwpack/dt-beagleboard-xm.conf b/hwpack/dt-beagleboard-xm.conf
index 026dbe9..1b7a51c 100644
--- a/hwpack/dt-beagleboard-xm.conf
+++ b/hwpack/dt-beagleboard-xm.conf
@@ -1,5 +1,5 @@
 #!/bin/bash
-#        --dtb dt-beagleboard-xm (BeagleBoard xMA/B/C (Device Tree):experimental)
+#        --dtb dt-beagleboard-xm (BeagleBoard xMA/B/C (Device Tree):supported)
 
 #Bootloader:
 conf_board="omap3_beagle"
diff --git a/hwpack/omap3-beagle-dt.conf b/hwpack/omap3-beagle-dt.conf
deleted file mode 100644
index da95506..0000000
--- a/hwpack/omap3-beagle-dt.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-#        --dtb omap3-beagle-dt (BeagleBoard (Device Tree):experimental)
-
-#Bootloader:
-conf_board="omap3_beagle"
-conf_bl_http="https://rcn-ee.net/deb/tools/latest"
-conf_bl_listfile="bootloader-ng"
-
-#Bootloader Partition:
-conf_boot_fstype="fat"
-
-bootloader_location="fatfs_boot"
-spl_name="MLO"
-boot_name="u-boot.img"
-
-#Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-#conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-#uboot_fdt_auto_detection=1
-
-#Kernel:
-#https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
-kernel_subarch="armv7"
-kernel_repo="TESTING"
-
-usbnet_mem="8192"
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x80008000"
-conf_loadaddr="0x80300000"
-conf_fdtaddr="0x815f0000"
-conf_initrdaddr="0x81600000"
-conf_fdtfile="omap3-beagle.dtb"
-need_dtbs=1
-#need_ti_connectivity_firmware=1
-
-#SYSTEM="video"
-#SYSTEM="serial"
-
-SYSTEM="beagleboard"
-
-SERIAL="ttyO2"
-SERIAL_CONSOLE="${SERIAL},115200n8"
-
-USE_KMS=1
-SERIAL_MODE=1
diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh
index 357d176..0c18f7f 100644
--- a/lib/debian-finish.sh
+++ b/lib/debian-finish.sh
@@ -95,9 +95,7 @@ fi
 
 cat > /etc/e2fsck.conf <<-__EOF__
 [options]
-
 broken_system_clock = true
-
 __EOF__
 
 cat > /etc/init.d/board_tweaks.sh <<-__EOF__
@@ -114,14 +112,14 @@ cat > /etc/init.d/board_tweaks.sh <<-__EOF__
 
 	case "\$1" in
 	start|reload|force-reload|restart)
-	        if [ -f /boot/uboot/SOC.sh ] ; then
+	        if [ -f /boot/uboot/SOC.sh ] && [ -f /boot/uboot/run_boot-scripts ] ; then
+	                if [ -f "/opt/boot-scripts/set_date.sh" ] ; then
+	                        /bin/sh /opt/boot-scripts/set_date.sh >/dev/null 2>&1 &
+	                fi
 	                board=\$(cat /boot/uboot/SOC.sh | grep "board" | awk -F"=" '{print \$2}')
-	                case "\${board}" in
-	                BEAGLEBONE_A)
-	                        if [ -f /boot/uboot/tools/target/BeagleBone.sh ] ; then
-	                                /bin/sh /boot/uboot/tools/target/BeagleBone.sh &> /dev/null &
-	                        fi;;
-	                esac
+	                if [ -f "/opt/boot-scripts/\${board}.sh" ] ; then
+	                        /bin/sh /opt/boot-scripts/\${board}.sh >/dev/null 2>&1 &
+	                fi
 	        fi
 	        ;;
 	stop)
@@ -148,10 +146,16 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then
 	cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img
 	rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true
 
+	#Cleanup:
+	mv /boot/uboot/bootdrive /boot/uboot/backup/ || true
+	mv /boot/uboot/mounts /boot/uboot/backup/ || true
+
 	#FIXME: Also reinstall these:
 	rm -f /boot/uboot/*dtbs.tar.gz || true
 	rm -f /boot/uboot/*modules.tar.gz || true
 
+	touch /boot/uboot/run_boot-scripts || true
+
 	mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
 	if [ "${zreladdr}" ] ; then
 		mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage
diff --git a/lib/ubuntu-finish.sh b/lib/ubuntu-finish.sh
index 647b99c..7fa08de 100644
--- a/lib/ubuntu-finish.sh
+++ b/lib/ubuntu-finish.sh
@@ -156,14 +156,14 @@ cat > /etc/init/board_tweaks.conf <<-__EOF__
 	start on runlevel 2
 
 	script
-	if [ -f /boot/uboot/SOC.sh ] ; then
+	if [ -f /boot/uboot/SOC.sh ] && [ -f /boot/uboot/run_boot-scripts ] ; then
+	        if [ -f "/opt/boot-scripts/set_date.sh" ] ; then
+	                /bin/sh /opt/boot-scripts/set_date.sh >/dev/null 2>&1 &
+	        fi
 	        board=\$(cat /boot/uboot/SOC.sh | grep "board" | awk -F"=" '{print \$2}')
-	        case "\${board}" in
-	        BEAGLEBONE_A)
-	                if [ -f /boot/uboot/tools/target/BeagleBone.sh ] ; then
-	                        /bin/sh /boot/uboot/tools/target/BeagleBone.sh &> /dev/null &
-	                fi;;
-	        esac
+	        if [ -f "/opt/boot-scripts/\${board}.sh" ] ; then
+	                /bin/sh /opt/boot-scripts/\${board}.sh >/dev/null 2>&1 &
+	        fi
 	fi
 	end script
 
@@ -177,10 +177,16 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then
 	cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img
 	rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true
 
+	#Cleanup:
+	mv /boot/uboot/bootdrive /boot/uboot/backup/ || true
+	mv /boot/uboot/mounts /boot/uboot/backup/ || true
+
 	#FIXME: Also reinstall these:
 	rm -f /boot/uboot/*dtbs.tar.gz || true
 	rm -f /boot/uboot/*modules.tar.gz || true
 
+	touch /boot/uboot/run_boot-scripts || true
+
 	mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd
 	if [ "${zreladdr}" ] ; then
 		mkimage -A arm -O linux -T kernel -C none -a ${zreladdr} -e ${zreladdr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage