diff --git a/changelog.d/10391.misc b/changelog.d/10391.misc
new file mode 100644
index 000000000..3f191b520
--- /dev/null
+++ b/changelog.d/10391.misc
@@ -0,0 +1 @@
+When building Debian packages for prerelease versions, set the Section accordingly.
diff --git a/docker/build_debian.sh b/docker/build_debian.sh
index f426d2b77..f572ed9aa 100644
--- a/docker/build_debian.sh
+++ b/docker/build_debian.sh
@@ -15,6 +15,20 @@ cd /synapse/build
 dch -M -l "+$DIST" "build for $DIST"
 dch -M -r "" --force-distribution --distribution "$DIST"
 
+# if this is a prerelease, set the Section accordingly.
+#
+# When the package is later added to the package repo, reprepro will use the
+# Section to determine which "component" it should go into (see
+# https://manpages.debian.org/stretch/reprepro/reprepro.1.en.html#GUESSING)
+
+DEB_VERSION=`dpkg-parsechangelog -SVersion`
+case $DEB_VERSION in
+    *rc*|*a*|*b*|*c*)
+        sed -ie '/^Section:/c\Section: prerelease' debian/control
+        ;;
+esac
+
+
 dpkg-buildpackage -us -uc
 
 ls -l ..