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/ubuntu-*
 dist
 packages
 doc/common.txt
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -181,8 +181,10 @@ docker-debian-jessie:
 	mkdir -p packages/debian-jessie
 	contrib/dockerdeb debian jessie
 
-docker-ubuntu-trusty:
-	mkdir -p packages/ubuntu-trusty
+contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
+	sed "s/__CODENAME__/$*/" $< > $@
+
+docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
 	contrib/dockerdeb ubuntu trusty
 
 fedora20:
diff --git a/contrib/docker/ubuntu-trusty b/contrib/docker/ubuntu-trusty
deleted file mode 100644
--- a/contrib/docker/ubuntu-trusty
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:trusty
-RUN apt-get update && apt-get install -y \
-  build-essential \
-  debhelper \
-  dh-python \
-  devscripts \
-  python \
-  python-all-dev \
-  python-docutils \
-  zip \
-  unzip
diff --git a/contrib/docker/ubuntu.template b/contrib/docker/ubuntu.template
new file mode 100644
--- /dev/null
+++ b/contrib/docker/ubuntu.template
@@ -0,0 +1,11 @@
+FROM ubuntu:__CODENAME__
+RUN apt-get update && apt-get install -y \
+  build-essential \
+  debhelper \
+  dh-python \
+  devscripts \
+  python \
+  python-all-dev \
+  python-docutils \
+  zip \
+  unzip