diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -30,6 +30,7 @@ build
 contrib/chg/chg
 contrib/hgsh/hgsh
 contrib/vagrant/.vagrant
+contrib/docker/debian-*
 contrib/docker/ubuntu-*
 dist
 packages
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -196,7 +196,10 @@ deb:
 ppa:
 	contrib/builddeb --source-only
 
-docker-debian-jessie:
+contrib/docker/debian-%: contrib/docker/debian.template
+	sed "s/__CODENAME__/$*/" $< > $@
+
+docker-debian-jessie: contrib/docker/debian-jessie
 	mkdir -p packages/debian-jessie
 	contrib/dockerdeb debian jessie
 
diff --git a/contrib/docker/debian-jessie b/contrib/docker/debian.template
rename from contrib/docker/debian-jessie
rename to contrib/docker/debian.template
--- a/contrib/docker/debian-jessie
+++ b/contrib/docker/debian.template
@@ -1,4 +1,4 @@
-FROM debian:jessie
+FROM debian:__CODENAME__
 RUN apt-get update && apt-get install -y \
   build-essential \
   debhelper \