diff --git a/.gitignore b/.gitignore
index 052be1b..fabbeaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /bcache-tools-dracut-module.tgz
 /bcache-tools-20131018.tar.gz
 /bcache-status-20140220.tar.gz
+/bcache-tools-0.9.tar.gz
diff --git a/bcache-tools.spec b/bcache-tools.spec
index 766f89a..d146604 100644
--- a/bcache-tools.spec
+++ b/bcache-tools.spec
@@ -1,9 +1,9 @@
-%global gitdate 20131018
+#%global gitdate 20131018
 
 Summary: Tools for Linux kernel block layer cache
 Name: bcache-tools
-Version: 0
-Release: 0.16.%{gitdate}git%{?dist}
+Version: 0.9
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://bcache.evilpiepirate.org/
@@ -11,8 +11,8 @@ VCS: http://evilpiepirate.org/git/bcache-tools.git
 # For now I am using a prerelease version obtained by:
 # git clone http://evilpiepirate.org/git/bcache-tools.git
 # cd bcache-tools/
-# git archive --format=tar --prefix=bcache-tools-20131018/ 89f11b135d1d57a5dbdc3548bfb9bfa0113075c4 | gzip > ../bcache-tools-20131018.tar.gz
-Source0: %{name}-%{gitdate}.tar.gz
+# git archive --format=tar --prefix=bcache-tools-0.9/ v0.9 | gzip > ../bcache-tools-0.9.tar.gz
+Source0: %{name}-%{version}.tar.gz
 # This part is also a prerelease version obtained by https://gist.github.com/djwong/6343451:
 # git clone https://gist.github.com/6343451.git
 # cd 6343451/
@@ -54,7 +54,7 @@ This package contains the utilities for manipulating bcache.
 %global dracutlibdir %{_prefix}/lib/dracut
 
 %prep
-%setup -q -n bcache-tools-%{gitdate}
+%setup -q -n bcache-tools-%{version}
 tar xzf %{SOURCE1} --strip-components=1
 tar xzf %{SOURCE2}
 %patch0 -p1 -b .man
@@ -98,6 +98,9 @@ install -p  -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status
 %{dracutlibdir}/modules.d/90bcache
 
 %changelog
+* Sat May 10 2014 Rolf Fokkens <rolf@rolffokkens.nl> - 0.9-1
+- Using the v0.9 git tag instead of the commit#
+
 * Thu Feb 20 2014 Rolf Fokkens <rolf@rolffokkens.nl> - 0-0.16.20131018git
 - (#1066555) updated bcache-status to latest upstream gist
 
diff --git a/sources b/sources
index 18361e6..5606ca4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 18fa816e496899ab59a9615d4a92bcde  bcache-status-20140220.tar.gz
-ac24d7141a55806df838f5159358ce10  bcache-tools-20131018.tar.gz
+3e3f639bb5c95ba76f33c6bb83c2b6ac  bcache-tools-0.9.tar.gz
 e5ec2b71700ab30d20603b7d7faf929e  bcache-tools-dracut-module.tgz