diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -31,8 +31,8 @@
 contrib/chg/chg
 contrib/hgsh/hgsh
 contrib/vagrant/.vagrant
-contrib/docker/debian-*
-contrib/docker/ubuntu-*
+contrib/packaging/docker/debian-*
+contrib/packaging/docker/ubuntu-*
 dist
 packages
 doc/common.txt
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -209,40 +209,40 @@
 ppa:
 	contrib/builddeb --source-only
 
-contrib/docker/debian-%: contrib/docker/debian.template
+contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
 	sed "s/__CODENAME__/$*/" $< > $@
 
-docker-debian-jessie: contrib/docker/debian-jessie
+docker-debian-jessie: contrib/packaging/docker/debian-jessie
 	contrib/dockerdeb debian jessie
 
-docker-debian-stretch: contrib/docker/debian-stretch
+docker-debian-stretch: contrib/packaging/docker/debian-stretch
 	contrib/dockerdeb debian stretch
 
-contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
+contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template
 	sed "s/__CODENAME__/$*/" $< > $@
 
-docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
+docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty
 	contrib/dockerdeb ubuntu trusty
 
-docker-ubuntu-trusty-ppa: contrib/docker/ubuntu-trusty
+docker-ubuntu-trusty-ppa: contrib/packaging/docker/ubuntu-trusty
 	contrib/dockerdeb ubuntu trusty --source-only
 
-docker-ubuntu-xenial: contrib/docker/ubuntu-xenial
+docker-ubuntu-xenial: contrib/packaging/docker/ubuntu-xenial
 	contrib/dockerdeb ubuntu xenial
 
-docker-ubuntu-xenial-ppa: contrib/docker/ubuntu-xenial
+docker-ubuntu-xenial-ppa: contrib/packaging/docker/ubuntu-xenial
 	contrib/dockerdeb ubuntu xenial --source-only
 
-docker-ubuntu-artful: contrib/docker/ubuntu-artful
+docker-ubuntu-artful: contrib/packaging/docker/ubuntu-artful
 	contrib/dockerdeb ubuntu artful
 
-docker-ubuntu-artful-ppa: contrib/docker/ubuntu-artful
+docker-ubuntu-artful-ppa: contrib/packaging/docker/ubuntu-artful
 	contrib/dockerdeb ubuntu artful --source-only
 
-docker-ubuntu-bionic: contrib/docker/ubuntu-bionic
+docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic
 	contrib/dockerdeb ubuntu bionic
 
-docker-ubuntu-bionic-ppa: contrib/docker/ubuntu-bionic
+docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic
 	contrib/dockerdeb ubuntu bionic --source-only
 
 fedora20:
diff --git a/contrib/dockerlib.sh b/contrib/dockerlib.sh
--- a/contrib/dockerlib.sh
+++ b/contrib/dockerlib.sh
@@ -22,7 +22,7 @@
 function initcontainer() {
   [ "$1" ] || { echo "Error: platform name must be specified"; exit 1; }
 
-  DFILE="$ROOTDIR/contrib/docker/$1"
+  DFILE="$ROOTDIR/contrib/packaging/docker/$1"
   [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; }
 
   CONTAINER="hg-dockerrpm-$1"
diff --git a/contrib/docker/centos5 b/contrib/packaging/docker/centos5
rename from contrib/docker/centos5
rename to contrib/packaging/docker/centos5
diff --git a/contrib/docker/centos6 b/contrib/packaging/docker/centos6
rename from contrib/docker/centos6
rename to contrib/packaging/docker/centos6
diff --git a/contrib/docker/centos7 b/contrib/packaging/docker/centos7
rename from contrib/docker/centos7
rename to contrib/packaging/docker/centos7
diff --git a/contrib/docker/debian.template b/contrib/packaging/docker/debian.template
rename from contrib/docker/debian.template
rename to contrib/packaging/docker/debian.template
diff --git a/contrib/docker/fedora20 b/contrib/packaging/docker/fedora20
rename from contrib/docker/fedora20
rename to contrib/packaging/docker/fedora20
diff --git a/contrib/docker/fedora21 b/contrib/packaging/docker/fedora21
rename from contrib/docker/fedora21
rename to contrib/packaging/docker/fedora21
diff --git a/contrib/docker/ubuntu.template b/contrib/packaging/docker/ubuntu.template
rename from contrib/docker/ubuntu.template
rename to contrib/packaging/docker/ubuntu.template