diff --git a/aqbanking-2.2.9.tar.bz2 b/aqbanking-2.2.9.tar.bz2
deleted file mode 100644
index 170d353..0000000
--- a/aqbanking-2.2.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1219a202fd3abbb2ef246a9f8536585bd7c24cd8bfa065deb47632e18964ff6b
-size 3337749
diff --git a/aqbanking-3.2.1.tar.bz2 b/aqbanking-3.2.1.tar.bz2
new file mode 100644
index 0000000..2fe9ede
--- /dev/null
+++ b/aqbanking-3.2.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6abd63990616fb13f22f6fafb4b2d69dc18d9d62c9d04063e5abe72556acd529
+size 3264309
diff --git a/aqbanking-internal-lib-reference.patch b/aqbanking-internal-lib-reference.patch
index 577f716..1e8172e 100644
--- a/aqbanking-internal-lib-reference.patch
+++ b/aqbanking-internal-lib-reference.patch
@@ -16,24 +16,24 @@ in installed .la file /var/tmp/aqbanking-2.2.9-build/usr/lib64/aqbanking/plugins
    error.cpp \
    loganalyzer.cpp
  
--liblogmanager_la_LIBADD = \
--  -L$(top_builddir)/src/plugins/backends/aqhbci/plugin $(aqhbci_internal_libs)
-+liblogmanager_la_LIBADD = $(aqhbci_internal_libs)
+-liblogmanager_la_LIBADD = $(qbanking_internal_libs) $(aqhbci_internal_libs) \
+-  -L$(top_builddir)/src/plugins/backends/aqhbci/plugin
++liblogmanager_la_LIBADD = $(qbanking_internal_libs) $(aqhbci_internal_libs)
  
  BUILT_SOURCES = $(nodist_liblogmanager_la_SOURCES)
  CLEANFILES = $(nodist_liblogmanager_la_SOURCES) $(nodist_noinst_HEADERS)
 --- src/plugins/bankinfo/generic/Makefile.am
 +++ src/plugins/bankinfo/generic/Makefile.am
-@@ -17,7 +17,7 @@
+@@ -19,7 +19,7 @@
  libbankinfo_la_SOURCES=\
   generic.c
  
--libbankinfo_la_LIBADD = -L$(top_builddir)/src/libs/aqbanking $(aqbanking_internal_libs) $(gwenhywfar_libs)
-+libbankinfo_la_LIBADD = $(aqbanking_internal_libs) $(gwenhywfar_libs)
+-libbankinfo_la_LIBADD = -L$(top_builddir)/src/libs/aqbanking $(aqbanking_internal_libs) $(gwenhywfar_libs) 
++libbankinfo_la_LIBADD = $(aqbanking_internal_libs) $(gwenhywfar_libs) 
  libbankinfo_la_LDFLAGS = $(STRIPALL)
  
  at_files=at/blz.idx at/bic.idx at/namloc.idx at/banks.data
-@@ -125,7 +125,7 @@
+@@ -150,7 +150,7 @@
  else
  noinst_PROGRAMS=mkdeinfo
  mkdeinfo_SOURCES=mkdeinfo.c
diff --git a/aqbanking.changes b/aqbanking.changes
index 8ca970d..7722df7 100644
--- a/aqbanking.changes
+++ b/aqbanking.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 20 18:41:51 CET 2008 - ro@suse.de
+
+- update to version 3.2.1 to build on top of a current libchipcard
+  and gwenhywfar
+- some plugins are still disabled like aqdtaus and aqgeldkarte
+
 -------------------------------------------------------------------
 Thu Jan 24 11:16:17 CET 2008 - coolo@suse.de
 
diff --git a/aqbanking.spec b/aqbanking.spec
index a84916a..b71497c 100644
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package aqbanking (Version 2.2.9)
+# spec file for package aqbanking (Version 3.2.1)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -10,10 +10,11 @@
 
 # norootforbuild
 
+
 Name:           aqbanking
-BuildRequires:  doxygen fdupes gtk2-devel gwenhywfar-devel kdelibs3-devel ktoblzcheck-devel libchipcard3-devel libglade2-devel libofx-devel python-devel pyxml qt3-devel
-Version:        2.2.9
-Release:        75
+BuildRequires:  doxygen fdupes gmp-devel gtk2-devel gwenhywfar-devel kdelibs3-devel ktoblzcheck-devel libchipcard4-devel libglade2-devel libofx-devel python-devel pyxml qt3-devel
+Version:        3.2.1
+Release:        1
 Requires:       %{name}-lang = %{version}
 Url:            http://www.aquamaniac.de/aqbanking/
 Group:          Productivity/Office/Finance
@@ -24,7 +25,7 @@ Patch:          aqbanking-aqyellownet-libtool.patch
 Patch1:         aqbanking-internal-lib-reference.patch
 Patch2:         aqbanking-open-call.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define aq_plugindir   %{_libdir}/aqbanking/plugins/16
+%define aq_plugindir   %{_libdir}/aqbanking/plugins/20
 %define fronts_libdir  %{aq_plugindir}/frontends
 %define imex_plugindir %{aq_plugindir}/imexporters
 %define imex_datadir   %{_datadir}/%{name}/imexporters
@@ -235,15 +236,16 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
 %configure\
 	--enable-release\
 %ifarch %ix86
-	--with-backends="aqdtaus aqgeldkarte aqhbci aqnone aqofxconnect aqyellownet"\
+	--with-backends="aqhbci aqnone aqofxconnect aqyellownet"\
 %else
-	--with-backends="aqdtaus aqhbci aqgeldkarte aqnone aqofxconnect"\
+	--with-backends="aqhbci aqnone aqofxconnect"\
 %endif
 	--enable-python\
 	--enable-full-doc\
 	--with-docpath=%{_docdir}/%{name} \
 	--with-qt3-libs=/usr/lib/qt3/%{_lib} \
 	--with-kde3-libs=/opt/kde3/%{_lib}
+# disabled backends: aqdtaus aqgeldkarte
 # Does not work with aqbanking-2.2.9:
 #make %{?jobs:-j%jobs}
 make
@@ -251,7 +253,7 @@ make
 %install
 %makeinstall idatadir=%{_docdir}/%{name}
 cp -a AUTHORS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}
-rm $RPM_BUILD_ROOT%{_libdir}/aqbanking/plugins/16/bankinfo/*.la
+rm -fv $RPM_BUILD_ROOT%{_libdir}/aqbanking/plugins/*/bankinfo/*.la
 %find_lang %{name}
 %fdupes $RPM_BUILD_ROOT
 
@@ -286,18 +288,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc %{_docdir}/%{name}
 ### The original aqbanking files
-%{_bindir}/%{name}-tool
 %{_libdir}/lib%{name}*.so.*
 %{_libdir}/gwenhywfar
 %{_datadir}/%{name}/bankinfo
+%{_datadir}/%{name}/backends
 %{aq_plugindir}/bankinfo
 %{imex_plugindir}/csv.*
-%{imex_plugindir}/dbio.*
+#%{imex_plugindir}/dbio.*
 %{imex_plugindir}/dtaus.*
-%{imex_plugindir}/eri.*
+#%{imex_plugindir}/eri.*
 %{imex_plugindir}/eri2.*
 %{imex_plugindir}/openhbci1.*
-%{imex_plugindir}/qif.*
+#%{imex_plugindir}/qif.*
 %{imex_plugindir}/swift.*
 %{imex_plugindir}/xmldb.*
 %{imex_plugindir}/yellownet.*
@@ -306,24 +308,24 @@ rm -rf $RPM_BUILD_ROOT
 %{imex_datadir}/eri
 %{imex_datadir}/eri2
 %{imex_datadir}/openhbci1
-%{imex_datadir}/qif
+#%{imex_datadir}/qif
 %{imex_datadir}/swift
 %{imex_datadir}/xmldb/profiles/*
 %{imex_datadir}/yellownet/profiles/*
 ### The aqhbci files
-%{_bindir}/aqhbci-tool
+%{_bindir}/aqhbci-tool3
 %{_libdir}/libaqhbci.so.*
 %{aq_plugindir}/providers/aqhbci.*
-%{_datadir}/aqhbci
+#%{_datadir}/aqhbci
 #%{_datadir}/doc/aqhbci
 ### The dtaus files
-%{_libdir}/libaqdtaus.so.*
-%{aq_plugindir}/providers/aqdtaus.*
+#%{_libdir}/libaqdtaus.so.*
+#%{aq_plugindir}/providers/aqdtaus.*
 ### The aqnone files
 %{_libdir}/libaqnone.so.*
 %{aq_plugindir}/providers/aqnone.*
 ### The cbanking files
-%{_libdir}/libcbanking.so.*
+#%{_libdir}/libcbanking.so.*
 ## Directories
 %dir %{_libdir}/aqbanking
 %dir %{_libdir}/aqbanking/plugins
@@ -352,31 +354,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}
 %{_libdir}/*.la
 %{_libdir}/libaqbanking.so
-%{_libdir}/libaqdtaus.so
+#%{_libdir}/libaqdtaus.so
 %{_libdir}/libaqhbci.so
 %{_libdir}/libaqnone.so
-%{_libdir}/libcbanking.so
+#%{_libdir}/libcbanking.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_datadir}/aclocal
 ### The aqhbci files
 #%{_bindir}/aqhbci-config
-%{_bindir}/hbcixml2
+%{_bindir}/hbcixml3
 %{_includedir}/aqhbci
 ### The cbanking files
 #%{_bindir}/cbanking-config
-%{_includedir}/cbanking
+#%{_includedir}/cbanking
 ### The g2banking files
 #%{_bindir}/g2banking-config
-%{_includedir}/g2banking
+#%{_includedir}/g2banking
 ### The qbanking files
 #%{_bindir}/qbanking-config
 %{_includedir}/qbanking
 ### The kbanking files
 #%{_bindir}/kbanking-config
-%{_includedir}/kbanking
+#%{_includedir}/kbanking
 ### The aqdtaus files
 #%{_bindir}/aqdtaus-config
-%{_includedir}/aqdtaus
+#%{_includedir}/aqdtaus
 ### The ofx files
 %{_includedir}/aqofxconnect
 %ifarch %ix86
@@ -385,10 +387,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 # .so files from sub-packages
 %{_libdir}/libqbanking.so
-%{_libdir}/libg2banking.so
-%{_libdir}/libkbanking.so
+#%{_libdir}/libg2banking.so
+#%{_libdir}/libkbanking.so
 %{_libdir}/libaqofxconnect.so
-%{_libdir}/libaqgeldkarte.so
+#%{_libdir}/libaqgeldkarte.so
 
 %files -n python-aqbanking
 %defattr(-,root,root)
@@ -396,23 +398,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files qt3
 %defattr(-,root,root)
-%{_bindir}/qb-help
+%{_bindir}/qb-help5
 %{_libdir}/libqbanking.so.*
 %{aq_plugindir}/debugger/aqhbci
 %{aq_plugindir}/wizards
 %{qb_cfgmoddir}/aqhbci*
-%{qb_cfgmoddir}/aqdtaus*
+#%{qb_cfgmoddir}/aqdtaus*
 %{_datadir}/%{name}/i18n
 %{fronts_datadir}/qbanking
-
-%files gtk2
-%defattr(-,root,root)
-%{_libdir}/libg2banking.so.*
-%{fronts_datadir}/g2banking
-
-%files kde3
-%defattr(-,root,root)
-%{_libdir}/libkbanking.so.*
+#%files gtk2
+#%defattr(-,root,root)
+#%{_libdir}/libg2banking.so.*
+#%{fronts_datadir}/g2banking
+#%files kde3
+#%defattr(-,root,root)
+#%{_libdir}/libkbanking.so.*
 
 %files ofx
 %defattr(-,root,root)
@@ -425,17 +425,15 @@ rm -rf $RPM_BUILD_ROOT
 %files ofx-qt3
 %defattr(-,root,root)
 %{qb_cfgmoddir}/aqofxconnect*
-
-%files geldkarte
-%defattr(-,root,root)
+#%files geldkarte
+#%defattr(-,root,root)
 #%{_bindir}/aqgeldkarte-config
-%{_libdir}/libaqgeldkarte.so.*
-%{_includedir}/aqgeldkarte
-%{aq_plugindir}/providers/aqgeldkarte.*
-
-%files geldkarte-qt3
-%defattr(-,root,root)
-%{qb_cfgmoddir}/aqgeldkarte*
+#%{_libdir}/libaqgeldkarte.so.*
+#%{_includedir}/aqgeldkarte
+#%{aq_plugindir}/providers/aqgeldkarte.*
+#%files geldkarte-qt3
+#%defattr(-,root,root)
+#%{qb_cfgmoddir}/aqgeldkarte*
 %ifarch %ix86
 
 %files yellownet
@@ -451,6 +449,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Feb 20 2008 ro@suse.de
+- update to version 3.2.1 to build on top of a current libchipcard
+  and gwenhywfar
+- some plugins are still disabled like aqdtaus and aqgeldkarte
 * Thu Jan 24 2008 coolo@suse.de
 - fix open call
 * Wed Aug 08 2007 maw@suse.de
@@ -482,7 +484,7 @@ rm -rf $RPM_BUILD_ROOT
   * Improved support for HBCI iTAN mode, added an import profile
   for ABN AMRO Bank (NL).
   * Fixes some errors.
-* Fri Sep 15 2006 jhargadon@suse.de
+* Sat Sep 16 2006 jhargadon@suse.de
 - update to version 2.2.1
 - fixed a bug in DTAUS importer profile "default"
 - src/libs/aqbanking/types/transaction.xml: Fix typos