diff --git a/scripts/bip-release b/scripts/bip-release
new file mode 100755
index 0000000..5164faa
--- /dev/null
+++ b/scripts/bip-release
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -d src ] ; then
+	echo "Please run me in bip sources root." >&2 
+	exit 1
+fi
+
+release="$1"
+
+if [ -n "$release" ]
+then
+	echo '#define BIP_VERSION "'$release'"' > src/version.h
+	git commit -a -m "Update src/version.h for release."
+	git tag release-$release
+	prefix=bip-$release
+else
+	prefix=bip-$(date +%y%m%d)
+fi
+
+olddir=$(pwd)
+tmpdir=$(mktemp -d /var/tmp/bip-XXXXX)
+git-archive --format=tar --prefix=$prefix/ HEAD > $tmpdir/$prefix.tar
+cd $tmpdir
+tar xf $prefix.tar
+cd $prefix
+./bootstrap
+cd ..
+tar czf $olddir/../$prefix.tar.gz $prefix
+cd $olddir
+rm -rf $tmpdir
+echo "See ../$prefix.tar.gz"
+
+if [ -n "$release" ]
+then
+	echo '#define BIP_VERSION "'$release'-git"' > src/version.h
+	git tag release-$release
+	git commit -a -m "Add -git to version string."
+fi
diff --git a/scripts/bip-take-snapshot b/scripts/bip-take-snapshot
deleted file mode 100755
index ade60de..0000000
--- a/scripts/bip-take-snapshot
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-prefix=bip-$(date +%y%m%d)
-
-if [ ! -d src ] ; then
-	echo "Please run me in bip sources root." >&2 
-	exit 1
-fi
-
-git-archive --format=tar --prefix=$prefix/ HEAD | gzip -c > ../$prefix.tar.gz
-echo "See ../$prefix.tar.gz"
-