@@ -78,7 +78,7 @@ set -e

 		EOF

 		cat >> "$DEST/$version/Dockerfile.build" <<-EOF

 			RUN cp -aL hack/make/.build-deb debian

-			RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo '  * Version: $VERSION'; echo; echo " -- $debMaintainer  $debDate"; } > debian/changelog && cat >&2 debian/changelog

+			RUN { echo '$debSource (${debVersion}-0~${version}) $suite; urgency=low'; echo; echo '  * Version: $VERSION'; echo; echo " -- $debMaintainer  $debDate"; } > debian/changelog && cat >&2 debian/changelog

 			RUN dpkg-buildpackage -uc -us -I.git

 		EOF

 		tempImage="docker-temp/build-deb:$version"

@@ -132,6 +132,7 @@ for dir in bundles/$VERSION/build-deb/*/; do

 	# update the filelist for this codename/component

 	find "$APTDIR/pool/$component" \

+		-name *~${codename}*.deb -o \

 		-name *~${codename#*-}*.deb > "$APTDIR/dists/$codename/$component/filelist"

 done