diff --git a/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade b/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
index a12ce78e..bd3a51d7 100755
--- a/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
+++ b/package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-for script in /lib/gluon/upgrade/*; do
-	"$script"
-done
+gluon-reconfigure
+
+exit 0
diff --git a/package/gluon-core/files/usr/bin/gluon-reconfigure b/package/gluon-core/files/usr/bin/gluon-reconfigure
new file mode 100755
index 00000000..6e7add98
--- /dev/null
+++ b/package/gluon-core/files/usr/bin/gluon-reconfigure
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd /lib/gluon/upgrade || exit 1
+
+err=0
+
+for script in *; do
+	echo "Configuring: ${script}"
+	./"$script" || err=1
+done
+
+if [ $err -eq 1 ]; then
+	echo 'One or more upgrade scripts failed. Please review the above error messages.'
+	exit 1
+fi
+
+exit 0