diff --git a/src/Makefile b/src/Makefile
index 5c50648f8..2a71976a1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,8 +20,6 @@ BIN_DIST_DIR=$(DIST_DIR)-$(host)
 
 GRAMMAR_DIST_DIR=GF-grammars-$(PACKAGE_VERSION)
 
-SNAPSHOT_DIR=GF-$(shell date +%Y%m%d)
-
 MSI_FILE=gf-$(subst .,_,$(PACKAGE_VERSION)).msi
 
 GF_DATA_DIR=$(datadir)/GF-$(PACKAGE_VERSION)
@@ -180,13 +178,14 @@ tools/$(GF_DOC_EXE): tools/GFDoc.hs
 dist:
 	-rm -rf $(DIST_DIR)
 	cp -r ../_darcs/current $(DIST_DIR)
+	cd $(DIST_DIR)/src && perl -pi -e "s/^AC_INIT\(\[GF\],\[[^\]]*\]/AC_INIT([GF],[$PACKAGE_VERSION]/" configure.ac
 	cd $(DIST_DIR)/src && autoconf && rm -rf autom4te.cache
 #	cd $(DIST_DIR)/grammars && sh mkLib.sh
 	cd $(DIST_DIR) && rm -rf $(NOT_IN_DIST)
 	$(TAR) -zcf $(DIST_DIR).tgz $(DIST_DIR)
 	rm -rf $(DIST_DIR)
 
-snapshot: DIST_DIR=$(SNAPSHOT_DIR)
+snapshot: PACKAGE_VERSION=$(shell date +%Y%m%d) DIST_DIR=GF-$(PACKAGE_VERSION)
 snapshot: dist
 
 rpm: dist