diff --git a/qca/.footprint b/qca/.footprint
index 9740bd96c..97f73a890 100644
--- a/qca/.footprint
+++ b/qca/.footprint
@@ -1,9 +1,41 @@
 drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/qcatool2
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/qca.h
--rw-r--r--	root/root	usr/include/qcaprovider.h
+drwxr-xr-x	root/root	usr/include/qt4/
+drwxr-xr-x	root/root	usr/include/qt4/QtCrypto/
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/QtCrypto
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_basic.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_cert.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_core.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_export.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_keystore.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_publickey.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_securelayer.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_securemessage.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_support.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_textfilter.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qca_tools.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qcaprovider.h
+-rw-r--r--	root/root	usr/include/qt4/QtCrypto/qpipe.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libqca.so -> libqca.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libqca.so.1 -> libqca.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libqca.so.1.0 -> libqca.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libqca.so.1.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/qca2.pc
+drwxr-xr-x	root/root	usr/lib/qt4/
+-rw-r--r--	root/root	usr/lib/qt4/libqca.prl
+lrwxrwxrwx	root/root	usr/lib/qt4/libqca.so -> libqca.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/qt4/libqca.so.2 -> libqca.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/qt4/libqca.so.2.0 -> libqca.so.2.0.0
+-rwxr-xr-x	root/root	usr/lib/qt4/libqca.so.2.0.0
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/qcatool2.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/qca/
+drwxr-xr-x	root/root	usr/share/qca/certs/
+-rw-r--r--	root/root	usr/share/qca/certs/rootcerts.pem
+drwxr-xr-x	root/root	usr/share/qt4/
+drwxr-xr-x	root/root	usr/share/qt4/mkspecs/
+drwxr-xr-x	root/root	usr/share/qt4/mkspecs/features/
+-rw-r--r--	root/root	usr/share/qt4/mkspecs/features/crypto.prf
diff --git a/qca/.md5sum b/qca/.md5sum
index 31a562a86..6093394fe 100644
--- a/qca/.md5sum
+++ b/qca/.md5sum
@@ -1 +1 @@
-ee44022eb0e5b8b5df64c62630f6e6b6  qca-1.0.tar.bz2
+07d54358ef4880d05b3c6f56b629aa55  qca-2.0.0.tar.bz2
diff --git a/qca/Pkgfile b/qca/Pkgfile
index 1e181390a..fa904b4bb 100644
--- a/qca/Pkgfile
+++ b/qca/Pkgfile
@@ -1,20 +1,24 @@
 # Description: QCA aims to provide a straightforward and cross-platform crypto API, using Qt.
 # URL: http://delta.affinix.com/qca/
-# Maintainer: Jose V Beneyto, joberui at ei dot upv dot es
-# Packager: Jose V Beneyto, joberui at ei dot upv dot es
-# Depends on: qt3
+# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Depends on: qt4
 
 name=qca
-version=1.0
-release=2
-source=(http://delta.affinix.com/download/${name}/${name}-${version}.tar.bz2)
+version=2.0.0
+release=1
+source=(http://delta.affinix.com/download/${name}/2.0/${name}-${version}.tar.bz2)
 
 build() {
   cd ${name}-${version}
   ./configure --prefix=/usr \
-              --qtdir=/usr/share/qt
+              --qtdir=/usr/share/qt4 \
+              --includedir=/usr/include/qt4 \
+              --libdir=/usr/lib/qt4
   make
-  install -d ${PKG}/usr/{include,lib}
-  cp -d libqca.so* ${PKG}/usr/lib
-  cp src/*.h ${PKG}/usr/include
+  export INSTALL_ROOT=${PKG}
+  make install
+  find ${PKG} -type f -name '*.debug' -exec rm -rf {} \;
+  find ${PKG} -type f -name 'README' -exec rm -rf {} \;
+  mv ${PKG}/usr/share/man ${PKG}/usr
 }
diff --git a/qca/README b/qca/README
new file mode 100644
index 000000000..5261bccbb
--- /dev/null
+++ b/qca/README
@@ -0,0 +1,6 @@
+
+README for qca-2.0.0
+
+** NOTE **
+
+If you have problems trying to build qca, remove qca 1.x before.