diff --git a/Makefile b/Makefile
index 74d4fb76..36a834b8 100644
--- a/Makefile
+++ b/Makefile
@@ -67,8 +67,9 @@ dist: clean
 	[ ! -f i3-${VERSION} ] || rm -rf i3-${VERSION}
 	[ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
 	mkdir i3-${VERSION}
-	cp Makefile DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO i3.config i3-${VERSION}
+	cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO i3.config i3-${VERSION}
 	cp -r src include docs man i3-${VERSION}
+	sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' Makefile > i3-${VERSION}/Makefile
 	tar cf i3-${VERSION}.tar i3-${VERSION}
 	bzip2 -9 i3-${VERSION}.tar
 	rm -rf i3-${VERSION}