diff --git a/scripts/copy_output.sh b/scripts/copy_output.sh
index 3454e6e3..d9e17526 100755
--- a/scripts/copy_output.sh
+++ b/scripts/copy_output.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-[ "$GLUON_IMAGEDIR" -a "$GLUON_PACKAGEDIR" -a "$OPENWRT_TARGET" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" ] || exit 1
+[ "$GLUON_IMAGEDIR" -a "$GLUON_PACKAGEDIR" -a "$OPENWRT_TARGET" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" -a "$GLUON_TARGETSDIR" ] || exit 1
 
 
 default_factory_ext='.bin'
@@ -191,7 +191,7 @@ no_opkg() {
 }
 
 
-. targets/"$1"; copy
+. "${GLUON_TARGETSDIR}/$1"; copy
 
 # Copy opkg repo
 if [ -z "$no_opkg" -a -z "$DEVICES" ]; then
diff --git a/scripts/generate_manifest.sh b/scripts/generate_manifest.sh
index 85e3ef53..04494a37 100755
--- a/scripts/generate_manifest.sh
+++ b/scripts/generate_manifest.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-[ "$GLUON_IMAGEDIR" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" ] || exit 1
+[ "$GLUON_IMAGEDIR" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" -a "$GLUON_TARGETSDIR" ] || exit 1
 
 
 default_sysupgrade_ext='.bin'
@@ -110,4 +110,4 @@ sysupgrade() {
 	fi
 }
 
-. targets/"$1"; generate
+. "${GLUON_TARGETSDIR}/$1"; generate
diff --git a/scripts/target_config.sh b/scripts/target_config.sh
index 7ffa6403..559eabea 100755
--- a/scripts/target_config.sh
+++ b/scripts/target_config.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-[ "$OPENWRT_TARGET" ] || exit 1
+[ "$OPENWRT_TARGET" -a "$GLUON_TARGETSDIR" ] || exit 1
 
 target="$1"
 packages=$2
@@ -74,9 +74,9 @@ packages() {
 # The sort will not only remove duplicate entries,
 # but also magically make =y entries override =m ones
 (
-	. targets/generic
+	. "${GLUON_TARGETSDIR}/generic"
 	packages $packages
 
-	. targets/"$target"
+	. "${GLUON_TARGETSDIR}/$target"
 	emit
 ) | sort -u
diff --git a/scripts/target_config_check.sh b/scripts/target_config_check.sh
index bfdc51bb..3ae01844 100755
--- a/scripts/target_config_check.sh
+++ b/scripts/target_config_check.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-[ "$OPENWRT_TARGET" ] || exit 1
+[ "$OPENWRT_TARGET" -a "$GLUON_TARGETSDIR" ] || exit 1
 
 target="$1"
 packages=$2
@@ -92,10 +92,10 @@ packages() {
 }
 
 
-. targets/generic
+. "${GLUON_TARGETSDIR}/generic"
 packages $packages
 
-. targets/"$target"
+. "${GLUON_TARGETSDIR}/$target"
 check_devices