diff --git a/.cvsignore b/.cvsignore
index 3eabba5..5c211b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-iw-0.0.20080703gitf6fc7dc.tar.bz2
+iw-0.9.5.tar.bz2
diff --git a/iw.spec b/iw.spec
index 89d0d17..c8186d6 100644
--- a/iw.spec
+++ b/iw.spec
@@ -1,8 +1,6 @@
-%define git_date 20080703
-%define git_version f6fc7dc
 Name:           iw
-Version:        0.0
-Release:        0.3.%{git_date}git%{git_version}%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        A nl80211 based wireless configuration tool
 
 Group:          System Environment/Base
@@ -11,8 +9,8 @@ URL:            http://www.linuxwireless.org/en/users/Documentation/iw
 # Generate tarball:
 # git clone http://git.sipsolutions.net/iw.git
 # cd iw
-# git-archive --format=tar --prefix=iw/ %{git_version} | bzip2 > iw-0.0.`date +%Y%m%d`git%{git_version}.tar.bz2
-Source0:        iw-0.0.%{git_date}git%{git_version}.tar.bz2
+# git-archive --format=tar --prefix=iw-%{version}/ v%{version} | bzip2 > iw-%{version}.tar.bz2
+Source0:        iw-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kernel-devel >= 2.6.24 
@@ -25,7 +23,7 @@ use a mac80211 driver as these are the new drivers being written -
 only because most new wireless devices being sold are now SoftMAC.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 
 %build
@@ -48,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Sun Sep 28 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.9.5-1
+- Update to 0.9.5
+
 * Tue Jul 22 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.0-0.3.20080703gitf6fc7dc
 - Add commitid to version
 - Use versioned buildrequires for kernel-devel
diff --git a/sources b/sources
index 78b9300..66070fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afb357f3eb058c72385e7256a36660a2  iw-0.0.20080703gitf6fc7dc.tar.bz2
+65582a45f016f0e699f1816265a222d2  iw-0.9.5.tar.bz2