diff --git a/Makefile b/Makefile
index 8d7527d..16fc092 100644
--- a/Makefile
+++ b/Makefile
@@ -93,20 +93,13 @@ clean:
 	rm -f $(dist_archive)
 
 dist: clean
-	@case `sed 15q ChangeLog` in \
-	*"$(VERSION)"*) : ;; \
-	*) \
-	   echo "ChangeLog not updated; not releasing" 1>&2;\
-	   exit 1;; \
-	esac
+	@git log > ChangeLog.git
+	@mkdir /tmp/$(distdir)
+	@cp -a * /tmp/$(distdir)/
 	@rm -f $(dist_archive);\
-	tar cf - --exclude=$(dist_archive) -C .. $(distdir)  |\
-	   bzip2 -9 -c > $(dist_archive)
+	tar cf - -C /tmp $(distdir) | bzip2 -9 -c > $(dist_archive)
+	@rm -rf /tmp/$(distdir)
 	@echo "file \`$(dist_archive)' created"
-	@sed -i "s|^LOGDIR=.*|LOGDIR=$(pck_logdir)|" autodist
-	@sed -i "s|^VERSION=.*|VERSION=$(VERSION)|" autodist
-	@sed -i "s|^VERSION=.*|VERSION=$(VERSION)|" autoport
-	@sed -i "s|^VERSION=.*|VERSION=$(VERSION)|" autoport-fix-environment
 
 dist-rpm: dist
 	@rpm_sourcedir=`rpm --eval=%{_sourcedir}`;\
diff --git a/VERSION b/VERSION
index 11440d4..b815a26 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-VERSION = 0.8.5
+VERSION = 0.9.0