--- a/Makefile	Fri Jan 16 04:26:40 2015 +0100
+++ b/Makefile	Sun Nov 02 02:36:47 2014 +0100
@@ -155,6 +155,17 @@
 	mkdir -p packages/fedora20
 	contrib/dockerrpm fedora20
 
+fedora21:
+	mkdir -p packages/fedora21
+	contrib/buildrpm
+	cp rpmbuild/RPMS/*/* packages/fedora21
+	cp rpmbuild/SRPMS/* packages/fedora21
+	rm -rf rpmbuild
+
+docker-fedora21:
+	mkdir -p packages/fedora21
+	contrib/dockerrpm fedora21
+
 centos5:
 	mkdir -p packages/centos5
 	contrib/buildrpm --withpython
@@ -188,5 +199,5 @@
 .PHONY: help all local build doc clean install install-bin install-doc \
 	install-home install-home-bin install-home-doc \
 	dist dist-notests check tests check-code update-pot \
-	osx fedora20 docker-fedora20 \
+	osx fedora20 docker-fedora20 fedora21 docker-fedora21 \
 	centos5 docker-centos5 centos6 docker-centos6 centos7 docker-centos7

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/docker/fedora21	Sun Nov 02 02:36:47 2014 +0100
@@ -0,0 +1,8 @@
+FROM fedora:21
+RUN yum install -y gcc
+RUN yum install -y python-devel python-docutils
+RUN yum install -y make
+RUN yum install -y rpm-build
+RUN yum install -y gettext
+# For creating repo meta data
+RUN yum install -y createrepo