diff --git a/Makefile b/Makefile
index a69772d2f3c3a6a14aa6d664ea20217f48392dd4_TWFrZWZpbGU=..7c9d42c1042d011db165493c92f844a0947b34a3_TWFrZWZpbGU= 100644
--- a/Makefile
+++ b/Makefile
@@ -183,7 +183,8 @@
   centos5 \
   centos6 \
   centos7 \
+  centos8 \
   deb \
   docker-centos5 \
   docker-centos6 \
   docker-centos7 \
@@ -186,7 +187,8 @@
   deb \
   docker-centos5 \
   docker-centos6 \
   docker-centos7 \
+  docker-centos8 \
   docker-debian-jessie \
   docker-debian-stretch \
   docker-fedora \
diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
index a69772d2f3c3a6a14aa6d664ea20217f48392dd4_Y29udHJpYi9wYWNrYWdpbmcvTWFrZWZpbGU=..7c9d42c1042d011db165493c92f844a0947b34a3_Y29udHJpYi9wYWNrYWdpbmcvTWFrZWZpbGU= 100644
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -16,7 +16,8 @@
 CENTOS_RELEASES := \
   5 \
   6 \
-  7
+  7 \
+  8
 
 # Build a Python for these CentOS releases.
 CENTOS_WITH_PYTHON_RELEASES := 5 6
diff --git a/contrib/packaging/docker/centos8 b/contrib/packaging/docker/centos8
new file mode 100644
index 0000000000000000000000000000000000000000..7c9d42c1042d011db165493c92f844a0947b34a3_Y29udHJpYi9wYWNrYWdpbmcvZG9ja2VyL2NlbnRvczg=
--- /dev/null
+++ b/contrib/packaging/docker/centos8
@@ -0,0 +1,15 @@
+FROM centos:centos8
+
+RUN groupadd -g %GID% build && \
+    useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
+
+RUN yum install -y \
+	gcc \
+	gettext \
+	make \
+	python3-devel \
+	python3-docutils \
+	rpm-build
+
+# For creating repo meta data
+RUN yum install -y createrepo