diff --git a/hwinfo.spec b/hwinfo.spec
index c33931f..f202d0b 100644
--- a/hwinfo.spec
+++ b/hwinfo.spec
@@ -1,5 +1,6 @@
+%define gitver %(echo %version | cut -d. -f1-2)
 Name:          hwinfo
-Version:       21.6
+Version:       21.10.1.1
 Release:       1mamba
 Summary:       Hardware information tool
 Group:         System/Kernel and Hardware
@@ -16,7 +17,7 @@ URL:           http://gitorious.org/opensuse/hwinfo
 # git checkout ${stable_version:?no stable version}
 # name=$name-$stable_version
 # git archive --format=tar --prefix=$name/ HEAD | bzip2 -9 > $(rpm --eval %_sourcedir)/$name.tar.bz2
-Source:        https://github.com/openSUSE/hwinfo.git/%{version}/hwinfo-%{version}.tar.bz2
+Source:        https://github.com/openSUSE/hwinfo.git/%{gitver}/hwinfo-%{gitver}.tar.bz2
 #Source:        git://gitorious.org/opensuse/hwinfo.git/%{version}/hwinfo-%{version}.tar.bz2
 Patch:         hwinfo-16.12-tiocgdev_undefined.patch
 ## AUTOBUILDREQ-BEGIN
@@ -45,7 +46,7 @@ A simple program that lists results from the hardware detection library.
 This package contains static libraries and header files need for development.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{gitver}
 [ -e VERSION ] || echo "%{version}" > VERSION
 #%patch
 
@@ -90,6 +91,9 @@ install -d %{buildroot}%{_localstatedir}/lib/hardware/udi
 %doc doc/libhd/html README
 
 %changelog
+* Sat Dec 27 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 21.10.1.1-1mamba
+- update to 21.10.1.1
+
 * Tue Aug 19 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 21.6-1mamba
 - update to 21.6