diff --git a/libqca.spec b/libqca.spec
index 06bb112..908f826 100644
--- a/libqca.spec
+++ b/libqca.spec
@@ -1,15 +1,15 @@
 %define majorminor %(echo %version | cut -d. -f 1-2)
 
 Name:          libqca
-Version:       2.0.3
-Release:       2mamba
+Version:       2.1.0
+Release:       1mamba
 Summary:       Qt Cryptographic Architecture (QCA)
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Aleph0 <aleph0@openmamba.org>
 URL:           http://delta.affinix.com/qca/
-Source:        http://delta.affinix.com/download/qca/%{majorminor}/qca-%{version}.tar.bz2
+Source:        http://delta.affinix.com/download/qca/2.0/qca-%{version}.tar.gz
 Patch0:        qca-2.0.3-gcc-4.7.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
@@ -36,26 +36,29 @@ This package contains static libraries and header files need for development.
 
 %prep
 %setup -q -n qca-%{version}
-%patch0 -p1
+#%patch0 -p1
 
 %build
-./configure \
-   --release \
-   --prefix=%{_qt4_prefix} \
-   --bindir=%{_qt4_bindir} \
-   --datadir=%{_qt4_datadir} \
-   --includedir=%{_qt4_headerdir} \
-   --libdir=%{_qt4_libdir}
+%cmake -d build
+
+#./configure \
+#   --release \
+#   --prefix=%{_qt4_prefix} \
+#   --bindir=%{_qt4_bindir} \
+#   --datadir=%{_qt4_datadir} \
+#   --includedir=%{_qt4_headerdir} \
+#   --libdir=%{_qt4_libdir}
 
 %make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-make install INSTALL_ROOT=%{buildroot}
+%makeinstall -C build
+#make install INSTALL_ROOT=%{buildroot}
 
-install -d %{buildroot}%{_mandir}/man1
-mv %{buildroot}%{_qt4_datadir}/man/man1/qcatool2.1 \
-   %{buildroot}%{_mandir}/man1/qcatool2.1
+#install -d %{buildroot}%{_mandir}/man1
+#mv %{buildroot}%{_qt4_datadir}/man/man1/qcatool2.1 \
+#   %{buildroot}%{_mandir}/man1/qcatool2.1
 
 rm -f %{buildroot}%{_qt4_libdir}/libqca.so.*.debug
 rm -f %{buildroot}%{_qt4_bindir}/qcatool2.debug
@@ -70,20 +73,36 @@ rm -fr %{buildroot}%{_qt4_datadir}/qca/certs
 
 %files
 %defattr(-,root,root)
-%{_qt4_bindir}/qcatool2
+%{_bindir}/mozcerts
+%{_bindir}/qcatool
 %{_qt4_libdir}/libqca.so.*
+%dir %{_libdir}/qca
+%dir %{_libdir}/qca/crypto
+%{_libdir}/qca/crypto/libqca-cyrus-sasl.so
+%{_libdir}/qca/crypto/libqca-gcrypt.so
+%{_libdir}/qca/crypto/libqca-gnupg.so
+%{_libdir}/qca/crypto/libqca-logger.so
+%{_libdir}/qca/crypto/libqca-nss.so
+%{_libdir}/qca/crypto/libqca-ossl.so
+%{_libdir}/qca/crypto/libqca-softstore.so
 %{_mandir}/man1/qcatool*
-%doc COPYING README TODO
+%doc COPYING
 
 %files devel
 %defattr(-,root,root)
-%{_qt4_datadir}/mkspecs/features/crypto.prf
-%{_qt4_headerdir}/QtCrypto/
-%{_qt4_libdir}/libqca.prl
+%dir %{_includedir}/QtCrypto
+%{_includedir}/QtCrypto/*
+%dir %{_libdir}/cmake/Qca
+%{_libdir}/cmake/Qca/Qca*.cmake
+/usr/mkspecs/features/crypto.prf
 %{_qt4_libdir}/libqca.so
 %{_libdir}/pkgconfig/qca2.pc
+%doc README TODO
 
 %changelog
+* Fri Nov 28 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0-1mamba
+- update to 2.1.0
+
 * Thu Jan 24 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.3-2mamba
 - added gcc 4.7 build patch