diff --git a/Makefile b/Makefile
index 05a3d8333694fe8520ab396cf3270d38e80e9ae4..26f5ec5f7a37709a6e257f076f5e369327d3e8b3 100644
--- a/Makefile
+++ b/Makefile
@@ -57,9 +57,17 @@ uninstall:
 	rm -rf ${font_dir}
 	rm -rf ${image_dir}
 
+dist:
+	mkdir /tmp/feh-${VERSION}
+	git --work-tree=/tmp/feh-${VERSION} checkout -f
+	sed -i 's/^VERSION ?= .*$$/VERSION ?= ${VERSION}/' \
+		/tmp/feh-${VERSION}/config.mk
+	tar -C /tmp -cjf ../feh-${VERSION}.tar.bz2 feh-${VERSION}
+	rm -r /tmp/feh-${VERSION}
+
 clean:
 	@${MAKE} -C src clean
 	@${MAKE} -C man clean
 
 .PHONY: all test test-x11 install uninstall clean install-man install-doc \
-	install-bin install-font install-img
+	install-bin install-font install-img dist