diff --git a/pack-maker.sh b/pack-maker.sh
index e6f8a51..c51e34d 100755
--- a/pack-maker.sh
+++ b/pack-maker.sh
@@ -42,6 +42,11 @@ if [ -z "${UPDATEDIR}" ]; then
 	UPDATEDIR="/var/lib/update/"
 fi
 
+# So we can call swupd_* with a sane path even if it's not / terminated
+if [ ! -z "${SWUPDREPO}" ]; then
+	SWUPDREPO="${SWUPDREPO}/"
+fi
+
 SWUPDWEBDIR="${UPDATEDIR}/www"
 
 MOM=${SWUPDWEBDIR}/${VER}/Manifest.MoM