diff --git a/eewiki_barefs_image.sh b/eewiki_barefs_image.sh
deleted file mode 100755
index 0403b317338c78581dacc1af5e845d067ac8a5f3..0000000000000000000000000000000000000000
--- a/eewiki_barefs_image.sh
+++ /dev/null
@@ -1,330 +0,0 @@
-#!/bin/sh -e
-#
-# Copyright (c) 2009-2014 Robert Nelson <robertcnelson@gmail.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-SYST=$(uname -n)
-time=$(date +%Y-%m-%d)
-
-DIR=$PWD
-if [ ! -d ${DIR}/ignore ] ; then
-	mkdir -p ${DIR}/ignore
-fi
-tempdir=$(mktemp -d -p ${DIR}/ignore)
-
-image_type="bare"
-
-. ${DIR}/lib/distro.sh
-
-minimal_armel () {
-	rm -f "${DIR}/.project" || true
-
-	#Actual Releases will use version numbers..
-	case "${deb_codename}" in
-	wheezy)
-		#https://www.debian.org/releases/wheezy/
-		export_filename="${deb_distribution}-${wheezy_release}-${image_type}-${deb_arch}-${time}"
-		;;
-	saucy)
-		export_filename="${deb_distribution}-${saucy_release}-${image_type}-${deb_arch}-${time}"
-		;;
-	trusty)
-		export_filename="${deb_distribution}-${trusty_release}-${image_type}-${deb_arch}-${time}"
-		;;
-	*)
-		export_filename="${deb_distribution}-${deb_codename}-${image_type}-${deb_arch}-${time}"
-		;;
-	esac
-
-	tempdir=$(mktemp -d -p ${DIR}/ignore)
-
-	cat > ${DIR}/.project <<-__EOF__
-		tempdir="${tempdir}"
-		export_filename="${export_filename}"
-
-		deb_distribution="${deb_distribution}"
-		deb_codename="${deb_codename}"
-		deb_arch="${deb_arch}"
-		deb_include="${deb_include}"
-		deb_exclude="${deb_exclude}"
-		deb_components="${deb_components}"
-
-		time="${time}"
-
-		deb_mirror="${deb_mirror}"
-
-		apt_proxy="${apt_proxy}"
-
-		base_pkg_list=""
-		chroot_multiarch_armel="${chroot_multiarch_armel}"
-
-		rfs_username="${rfs_username}"
-		rfs_fullname="${rfs_fullname}"
-		rfs_password="${rfs_password}"
-
-		rfs_hostname="${rfs_hostname}"
-		rfs_startup_scripts="${rfs_startup_scripts}"
-		rfs_startup_scripts_rcnee="${rfs_startup_scripts_rcnee}"
-
-		rfs_strip_locales="${rfs_strip_locales}"
-
-		include_firmware="${include_firmware}"
-
-		chroot_very_small_image="${chroot_very_small_image}"
-		chroot_ENABLE_DEB_SRC="${chroot_ENABLE_DEB_SRC}"
-		chroot_KERNEL_HTTP_DIR="${chroot_KERNEL_HTTP_DIR}"
-
-		repo_external="${repo_external}"
-		repo_external_arch="${repo_external_arch}"
-		repo_external_server="${repo_external_server}"
-		repo_external_dist="${repo_external_dist}"
-		repo_external_components="${repo_external_components}"
-		repo_external_key="${repo_external_key}"
-
-		chroot_COPY_SETUP_SDCARD="${chroot_COPY_SETUP_SDCARD}"
-
-		chroot_hook="${chroot_hook}"
-		chroot_script="${chroot_script}"
-		chroot_uenv_txt="${chroot_uenv_txt}"
-
-		chroot_enable_debian_backports="${chroot_enable_debian_backports}"
-		chroot_debian_backports_pkg_list="${chroot_debian_backports_pkg_list}"
-
-	__EOF__
-
-	cat ${DIR}/.project
-
-	/bin/sh -e "${DIR}/RootStock-NG.sh" || { exit 1 ; }
-}
-
-compression () {
-	echo "Starting Compression"
-	cd ${DIR}/deploy/
-
-	tar cvf ${export_filename}.tar ./${export_filename}
-
-	if [ -f ${DIR}/release ] ; then
-		if [ "x${SYST}" = "x${RELEASE_HOST}" ] ; then
-			if [ -d /mnt/farm/testing/pending/ ] ; then
-				cp -v ${export_filename}.tar /mnt/farm/testing/pending/${export_filename}.tar
-			fi
-		fi
-	fi
-	cd ${DIR}/
-}
-
-production () {
-	echo "Starting Production Stage"
-	cd ${DIR}/deploy/
-
-	unset actual_dir
-	if [ -f ${DIR}/release ] ; then
-		if [ "x${SYST}" = "x${RELEASE_HOST}" ] ; then
-			if [ -d /mnt/farm/testing/pending/ ] ; then
-				cp -v arm*.tar /mnt/farm/images/ || true
-				actual_dir="/mnt/farm/testing/pending"
-			fi
-		fi
-	fi
-
-	cat > ${DIR}/deploy/gift_wrap_final_images.sh <<-__EOF__
-	#!/bin/bash
-	#This script's only purpose is to remember a mundane task from release to release for the release manager.
-
-	xz -z -7 -v debian-${wheezy_release}-${image_type}-armel-${time}.tar
-	xz -z -7 -v debian-${wheezy_release}-${image_type}-armhf-${time}.tar
-
-	__EOF__
-
-	chmod +x ${DIR}/deploy/gift_wrap_final_images.sh
-
-	if [ ! "x${actual_dir}" = "x" ] ; then
-		cp ${DIR}/deploy/gift_wrap_final_images.sh ${actual_dir}/gift_wrap_final_images.sh
-		chmod +x ${actual_dir}/gift_wrap_final_images.sh
-	fi
-
-	cd ${DIR}/
-}
-
-pkg_list () {
-	deb_include=""
-	if [ ! "x${no_pkgs}" = "xenable" ] ; then
-		. ${DIR}/var/pkg_list.sh
-
-		required=""
-
-		if [ "x${include_firmware}" = "xenable" ] ; then
-			deb_include="${required} ${base_pkgs} ${extra_pkgs} ${firmware_pkgs}"
-		else
-			deb_include="${required} ${base_pkgs} ${extra_pkgs}"
-		fi
-		deb_include=$(echo ${deb_include} | sed 's/  / /g')
-	fi
-}
-
-is_ubuntu () {
-	deb_distribution="ubuntu"
-
-	rfs_hostname="arm"
-	rfs_username="ubuntu"
-	rfs_password="temppwd"
-	rfs_fullname="Demo User"
-
-	deb_mirror="ports.ubuntu.com/ubuntu-ports/"
-
-	pkg_list
-	deb_exclude=""
-	deb_components="main universe multiverse"
-}
-
-is_debian () {
-	deb_distribution="debian"
-
-	rfs_hostname="arm"
-	rfs_username="debian"
-	rfs_password="temppwd"
-	rfs_fullname="Demo User"
-
-	deb_mirror="ftp.us.debian.org/debian/"
-
-	pkg_list
-	deb_exclude="aptitude,aptitude-common,groff-base,info,install-info,libept1.4.12,manpages,man-db,tasksel,tasksel-data,vim-common,vim-tiny,wget,whiptail"
-	deb_components="main contrib non-free"
-	chroot_very_small_image="enable"
-}
-
-#13.10
-saucy_release () {
-	extra_pkgs="devmem2 python-software-properties"
-	firmware_pkgs="linux-firmware"
-	is_ubuntu
-	deb_codename="saucy"
-
-	minimal_armel
-	compression
-}
-
-#14.04 (lts)
-trusty_release () {
-	extra_pkgs="devmem2 python-software-properties"
-	firmware_pkgs="linux-firmware"
-	is_ubuntu
-	deb_codename="trusty"
-
-	minimal_armel
-	compression
-}
-
-#14.10
-utopic_release () {
-	extra_pkgs="devmem2 python-software-properties"
-	firmware_pkgs="linux-firmware"
-	is_ubuntu
-	deb_codename="utopic"
-
-	minimal_armel
-	compression
-}
-
-wheezy_release () {
-	extra_pkgs=""
-	firmware_pkgs="atmel-firmware firmware-ralink firmware-realtek libertas-firmware zd1211-firmware"
-	is_debian
-	deb_codename="wheezy"
-
-	minimal_armel
-	compression
-}
-
-jessie_release () {
-	extra_pkgs=""
-	firmware_pkgs="atmel-firmware firmware-ralink firmware-realtek libertas-firmware zd1211-firmware"
-	is_debian
-	deb_codename="jessie"
-
-	minimal_armel
-	compression
-}
-
-sid_release () {
-	extra_pkgs=""
-	firmware_pkgs="atmel-firmware firmware-ralink firmware-realtek libertas-firmware zd1211-firmware"
-	is_debian
-	deb_codename="sid"
-
-	minimal_armel
-	compression
-}
-
-if [ ! "${apt_proxy}" ] ; then
-	apt_proxy=""
-fi
-if [ ! "${mirror}" ] ; then
-	mirror="https://rcn-ee.net/deb"
-fi
-if [ -f ${DIR}/rcn-ee.host ] ; then
-	. ${DIR}/host/rcn-ee-host.sh
-fi
-
-mkdir -p ${DIR}/deploy/
-
-if [ -f ${DIR}/release ] ; then
-	chroot_ENABLE_DEB_SRC="enable"
-fi
-
-#chroot_COPY_SETUP_SDCARD="enable"
-
-#FIXME: things to add to .config:
-#include_firmware="enable"
-#rfs_startup_scripts="enable"
-#rfs_startup_scripts_rcnee="enable"
-#chroot_script=""
-
-rfs_strip_locales="${rfs_strip_locales:-enable}"
-
-#repo_external=""
-#repo_external_arch=""
-#repo_external_server=""
-#repo_external_dist=""
-#repo_external_components=""
-#repo_external_key=""
-
-no_pkgs="enable"
-
-#chroot_multiarch_armel=""
-
-#chroot_enable_debian_backports=""
-#chroot_debian_backports_pkg_list=""
-
-deb_arch="armel"
-wheezy_release
-#jessie_release
-
-deb_arch="armhf"
-wheezy_release
-#jessie_release
-#saucy_release
-#trusty_release
-
-production
-
-rm -rf ${tempdir} || true
-
-echo "done"
diff --git a/readme.md b/readme.md
index 00d34943b054d6a21a13c2b6dbdc980ca0dc5f84..1c10550d983a8db69b249f2e5a4d84926cd22cf3 100644
--- a/readme.md
+++ b/readme.md
@@ -47,7 +47,8 @@ Images:
     ./RootStock-NG.sh -c eewiki_minfs_ubuntu_stable_armhf
     http://eewiki.net/display/linuxonarm/Home
 
-    ./eewiki_barefs_image.sh
+    ./RootStock-NG.sh -c eewiki_bare_debian_stable_armel
+    ./RootStock-NG.sh -c eewiki_bare_debian_stable_armhf
     http://eewiki.net/display/linuxonarm/Home
 
     ./rcn-ee_image.sh