diff --git a/.gitignore b/.gitignore
index 2d9e510..e5596e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /stoken-0.2.tar.gz
 /stoken-0.5.tar.gz
+/stoken-ba44603cd58165144ef7b89f96f7a66f1fd46424.tar.gz
diff --git a/sources b/sources
index 193fb35..ef9bdc4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91e7ab180cb5072a9e050e1f8a915a7e  stoken-0.6.tar.gz
+6f53816b9c147013cfe37b72f8c3cbc8  stoken-ba44603cd58165144ef7b89f96f7a66f1fd46424.tar.gz
diff --git a/stoken.spec b/stoken.spec
index e91223b..480470d 100644
--- a/stoken.spec
+++ b/stoken.spec
@@ -1,16 +1,19 @@
+%global commit ba44603cd58165144ef7b89f96f7a66f1fd46424
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:           stoken
-Version:        0.6
-Release:        1%{?dist}
+Version:        0.8
+Release:        1%{?shortcommit:.git.%{shortcommit}}%{?dist}
 Summary:        Token code generator compatible with RSA SecurID 128-bit (AES) token
 
 License:        LGPLv2+
 URL:            http://%{name}.sf.net
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/cernekee/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
 
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
-BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  libtool
 BuildRequires:  pkgconfig(libtomcrypt)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -65,20 +68,20 @@ endorsed by RSA Security.
 This package contains the graphical interface program for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{commit}
 
 %build
 autoreconf -v -f --install
-%configure --with-gtk
+%configure --with-gtk --disable-static
 make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot}
 desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}-gui-small.desktop
 
 # Remove stuff we don't need
 find %{buildroot} -type f -name "*.la" -delete
-find %{buildroot} -type f -name "*.a" -delete
 rm -fr %{buildroot}%{_docdir}/%{name}
 
 %post libs -p /sbin/ldconfig
@@ -86,7 +89,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%doc COPYING.LIB README
+%doc COPYING.LIB README CHANGES
 %{_libdir}/*.so.*
 
 %files cli
@@ -98,6 +101,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %{_datadir}/applications/%{name}-gui.desktop
 %{_datadir}/applications/%{name}-gui-small.desktop
 %{_datadir}/pixmaps/%{name}-gui.png
+%{_datadir}/%{name}/
 %{_mandir}/man1/%{name}-gui.1.gz
 
 %files devel
@@ -106,6 +110,10 @@ rm -fr %{buildroot}%{_docdir}/%{name}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Aug 06 2014 Simone Caronni <negativo17@gmail.com> - 0.8-1.git.ba44603
+- Update to 0.8 snapshot, requires gtk 3.
+- Validate also small gui desktop file.
+
 * Mon Jun 23 2014 Simone Caronni <negativo17@gmail.com> - 0.6-1
 - Update to 0.6.