diff --git a/Makefile b/Makefile
index 265b878..3145ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 CUR_DIR = $(shell pwd)
+EPOCH = $(shell date +%s)
+ITERATION = $(shell git rev-parse --short=6 HEAD)
 
 all: rpm_centos7 deb_debian8 deb_xenial deb_bionic
 
@@ -18,7 +20,8 @@ rpm_centos7: images sdist
 		cysystemd:centos7 \
 		fpm --license "Apache 2" -d systemd-libs -d python -d python-enum34 \
 			--rpm-dist centos7 \
-			--epoch $(shell date +%s) \
+			--epoch $(EPOCH) \
+			--iteration $(ITERATION) \
 			-f -s python -t rpm /app
 
 deb_debian8: images sdist
@@ -31,8 +34,8 @@ deb_debian8: images sdist
 			-d libsystemd0 \
 			-d python-enum34 \
 			-d python-minimal \
-			--iteration debian8 \
-			--epoch $(shell date +%s) \
+			--iteration debian8_$(ITERATION) \
+			--epoch $(EPOCH) \
 			--python-install-lib /usr/lib/python2.7/dist-packages/ \
 			-f -s python -t deb /app
 
@@ -44,8 +47,8 @@ deb_debian8: images sdist
 			-d libsystemd0 \
 			-d libpython3.4 \
 			-d 'python3-minimal (>=3.4)' \
-			--iteration debian8 \
-			--epoch $(shell date +%s) \
+			--iteration debian8_$(ITERATION) \
+			--epoch $(EPOCH) \
 			--python-bin python3 --python-package-name-prefix python3 \
 			--python-install-lib /usr/lib/python3.4/dist-packages/ \
 			-f -s python -t deb /app
@@ -61,8 +64,8 @@ deb_xenial: images sdist
 			-d python-enum34 \
 			-d libpython2.7 \
 			--python-install-lib /usr/lib/python2.7/dist-packages/ \
-			--iteration xenial \
-			--epoch $(shell date +%s) \
+			--iteration xenial_$(ITERATION) \
+			--epoch $(EPOCH) \
 			-f -s python -t deb /app
 
 	docker run -i --rm \
@@ -75,8 +78,8 @@ deb_xenial: images sdist
 			-d libpython3.4 \
 			--python-install-lib /usr/lib/python3.4/dist-packages/ \
 			--python-bin python3 --python-package-name-prefix python3 \
-			--iteration xenial \
-			--epoch $(shell date +%s) \
+			--iteration xenial_$(ITERATION) \
+			--epoch $(EPOCH) \
 			-f -s python -t deb /app
 
 deb_bionic: images sdist
@@ -90,8 +93,8 @@ deb_bionic: images sdist
 			-d python-minimal \
 			-d python-enum34 \
 			--python-install-lib /usr/lib/python2.7/dist-packages/ \
-			--iteration bionic \
-			--epoch $(shell date +%s) \
+			--iteration bionic_$(ITERATION) \
+			--epoch $(EPOCH) \
 			-f -s python -t deb /app
 
 	docker run -i --rm \
@@ -103,8 +106,8 @@ deb_bionic: images sdist
 			-d 'python3-minimal (>=3.6)' \
 			-d libpython3.6 \
 			--python-bin python3 --python-package-name-prefix python3 \
-			--iteration bionic \
-			--epoch $(shell date +%s) \
+			--iteration bionic_$(ITERATION) \
+			--epoch $(EPOCH) \
 			--python-install-lib /usr/lib/python3.6/dist-packages/ \
 			-f -s python -t deb /app
 
diff --git a/cysystemd/__init__.py b/cysystemd/__init__.py
index 0ca5adc..f89ab67 100644
--- a/cysystemd/__init__.py
+++ b/cysystemd/__init__.py
@@ -1,5 +1,5 @@
 package_info = "SystemD wrapper on Cython"
-version_info = (0, 17, 0)
+version_info = (0, 17, 1)
 
 
 author_info = (