diff --git a/configs/eewiki_minfs_debian_jessie_armel.conf b/configs/eewiki_minfs_debian_jessie_armel.conf
index e45fd354bb55e27e402e099e44e9b8c922ab4643..6cc10500f29746788598be68d14a951c681e0e7a 100644
--- a/configs/eewiki_minfs_debian_jessie_armel.conf
+++ b/configs/eewiki_minfs_debian_jessie_armel.conf
@@ -10,19 +10,60 @@ image_type="minimal"
 deb_distribution="debian"
 deb_codename="jessie"
 deb_arch="armel"
-deb_include="apache2 atmel-firmware avahi-daemon bsdmainutils btrfs-tools \
-ca-certificates cpufrequtils dosfstools fbset file firmware-ralink \
-firmware-realtek firmware-zd1211git-core hdparm hexedit hostapd i2c-tools \
-initramfs-tools libertas-firmware locales lowpan-tools lshw memtester mtd-utils \
-nano openssh-server ppp read-edid rsync sudo systemd u-boot-tools udhcpd \
-usb-modeswitch usbutils wireless-tools wpasupplicant wvdial"
+deb_include="	\
+	apache2	\
+	atmel-firmware	\
+	avahi-daemon	\
+	bsdmainutils	\
+	btrfs-tools	\
+	ca-certificates	\
+	cpufrequtils	\
+	dosfstools	\
+	fbset	\
+	file	\
+	firmware-ralink	\
+	firmware-realtek	\
+	firmware-zd1211	\
+	git-core	\
+	hdparm	\
+	hexedit	\
+	hostapd	\
+	i2c-tools	\
+	initramfs-tools	\
+	libertas-firmware	\
+	locales	\
+	lowpan-tools	\
+	lshw	\
+	memtester	\
+	mtd-utils	\
+	nano	\
+	openssh-server	\
+	ppp	\
+	read-edid	\
+	rsync	\
+	sudo	\
+	systemd	\
+	u-boot-tools	\
+	udhcpd	\
+	usb-modeswitch	\
+	usbutils	\
+	wireless-tools	\
+	wpasupplicant	\
+	wvdial	\
+"
+
 deb_exclude=""
 deb_components="main contrib non-free"
 deb_mirror=""
 ##
 ##Some packages fail to install via debootstrap: deb_additional_pkgs="<comma|space>"
 ##
-deb_additional_pkgs="lsb-release pastebinit python-dbus"
+deb_additional_pkgs="	\
+	lsb-release	\
+	pastebinit	\
+	python-dbus	\
+"
+
 ##
 rfs_username="debian"
 rfs_fullname="Demo User"
diff --git a/target/chroot/beagleboard.org-console-jessie.sh b/target/chroot/beagleboard.org-console-jessie.sh
index 417590674fc7fdd2a7b0a102c3292e51ea539425..33b20b8ad6058e4e8f67bf7ec4d0679d2ffd322a 100755
--- a/target/chroot/beagleboard.org-console-jessie.sh
+++ b/target/chroot/beagleboard.org-console-jessie.sh
@@ -220,7 +220,7 @@ install_pip_pkgs () {
 }
 
 install_git_repos () {
-	if [ -f /usr/bin/jekyll ] ; then
+	if [ -d /usr/local/lib/node_modules/bonescript ] ; then
 		if [ -d /etc/apache2/ ] ; then
 			#bone101 takes over port 80, so shove apache/etc to 8080:
 			if [ -f /etc/apache2/ports.conf ] ; then
@@ -229,6 +229,9 @@ install_git_repos () {
 			if [ -f /etc/apache2/sites-enabled/000-default ] ; then
 				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default
 			fi
+			if [ -f /etc/apache2/sites-enabled/000-default.conf ] ; then
+				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default.conf
+			fi
 			if [ -f /var/www/html/index.html ] ; then
 				rm -rf /var/www/html/index.html || true
 			fi
diff --git a/target/chroot/beagleboard.org-jessie.sh b/target/chroot/beagleboard.org-jessie.sh
index 62e1114f18d368dbd538998fdce70e140cd09879..f532ab263a5daf30f9b78f6fe6d08cfae41bb588 100755
--- a/target/chroot/beagleboard.org-jessie.sh
+++ b/target/chroot/beagleboard.org-jessie.sh
@@ -220,7 +220,7 @@ install_pip_pkgs () {
 }
 
 install_git_repos () {
-	if [ -f /usr/bin/jekyll ] ; then
+	if [ -d /usr/local/lib/node_modules/bonescript ] ; then
 		if [ -d /etc/apache2/ ] ; then
 			#bone101 takes over port 80, so shove apache/etc to 8080:
 			if [ -f /etc/apache2/ports.conf ] ; then
@@ -229,6 +229,9 @@ install_git_repos () {
 			if [ -f /etc/apache2/sites-enabled/000-default ] ; then
 				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default
 			fi
+			if [ -f /etc/apache2/sites-enabled/000-default.conf ] ; then
+				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default.conf
+			fi
 			if [ -f /var/www/html/index.html ] ; then
 				rm -rf /var/www/html/index.html || true
 			fi
diff --git a/target/chroot/machinekit-jessie.sh b/target/chroot/machinekit-jessie.sh
index d07a104e7d7dce7425b104e12283010ad4b543ba..6aa1c4198cd6a03080957cfbd7069daaa6a2b9c1 100755
--- a/target/chroot/machinekit-jessie.sh
+++ b/target/chroot/machinekit-jessie.sh
@@ -221,7 +221,7 @@ early_git_repos () {
 }
 
 install_git_repos () {
-	if [ -f /usr/bin/jekyll ] ; then
+	if [ -d /usr/local/lib/node_modules/bonescript ] ; then
 		if [ -d /etc/apache2/ ] ; then
 			#bone101 takes over port 80, so shove apache/etc to 8080:
 			if [ -f /etc/apache2/ports.conf ] ; then
@@ -230,6 +230,9 @@ install_git_repos () {
 			if [ -f /etc/apache2/sites-enabled/000-default ] ; then
 				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default
 			fi
+			if [ -f /etc/apache2/sites-enabled/000-default.conf ] ; then
+				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default.conf
+			fi
 			if [ -f /var/www/html/index.html ] ; then
 				rm -rf /var/www/html/index.html || true
 			fi
diff --git a/target/chroot/seeed-jessie.sh b/target/chroot/seeed-jessie.sh
index fa384c64af8a9365d4094832c8da08aec68e1079..71cae5871c388195dfb51586eec9f9f12a6efdfa 100755
--- a/target/chroot/seeed-jessie.sh
+++ b/target/chroot/seeed-jessie.sh
@@ -298,7 +298,7 @@ cleanup_npm_cache () {
 }
 
 install_git_repos () {
-	if [ -f /usr/bin/jekyll ] ; then
+	if [ -d /usr/local/lib/node_modules/bonescript ] ; then
 		if [ -d /etc/apache2/ ] ; then
 			#bone101 takes over port 80, so shove apache/etc to 8080:
 			if [ -f /etc/apache2/ports.conf ] ; then
@@ -307,6 +307,9 @@ install_git_repos () {
 			if [ -f /etc/apache2/sites-enabled/000-default ] ; then
 				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default
 			fi
+			if [ -f /etc/apache2/sites-enabled/000-default.conf ] ; then
+				sed -i -e 's:80:8080:g' /etc/apache2/sites-enabled/000-default.conf
+			fi
 			if [ -f /var/www/html/index.html ] ; then
 				rm -rf /var/www/html/index.html || true
 			fi