diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index c13bbbb92e..2ee3bb8efc 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -788,6 +788,16 @@ genmodctl_mod () {
   echo
 }
 
+codename="sid"
+while getopts "r:" o; do
+  case "$o" in
+    r) codename="$OPTARG" ;;
+  esac
+done
+shift $(($OPTIND-1))
+
+echo "Bootstrapping debian/ for ${codename}" >&2
+echo >&2
 echo "Please wait, this takes a few seconds..." >&2
 
 parse_dir=control-modules.parse
diff --git a/scripts/ci/debsrcbuilder.sh b/scripts/ci/debsrcbuilder.sh
index 70aceeeee0..4e0d5aad57 100755
--- a/scripts/ci/debsrcbuilder.sh
+++ b/scripts/ci/debsrcbuilder.sh
@@ -12,6 +12,7 @@ datestamp="$(date +%Y%m%dT%H%M%SZ)"
 nightly="n${datestamp}"
 build="b$2"
 distro=${3:="unstable"}
+codename=${4:="sid"}
 
 fver="${ver}~${nightly}~${build}"
 fname="freeswitch-$fver"
@@ -58,13 +59,13 @@ echo "Compressing $orig.tar with xz -6..." >&2
 xz -6 $orig.tar
 
 cd $bdir
-(cd debian && ./bootstrap.sh)
+(cd debian && ./bootstrap.sh -c "$codename")
 # dch can't handle comments in control file
 (cd debian; \
   mv control control.orig; \
   grep -e '^#' -v control.orig > control)
 # dependency: libparse-debcontrol-perl
-dch -b -v "${fver}-1" \
+dch -b -v "${fver}-1~${codename}+1" \
   -M --force-distribution -D "$distro" \
   "Nightly build at ${datestamp}."
 # dependency: fakeroot