diff --git a/aqbanking-2.3.3.tar.bz2 b/aqbanking-2.3.3.tar.bz2
new file mode 100644
index 0000000..135fe21
--- /dev/null
+++ b/aqbanking-2.3.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:759532ab281329f25a939f5690a563cf585dab13f8f55b673a6ea78b62b18084
+size 3341856
diff --git a/aqbanking-3.2.1.tar.bz2 b/aqbanking-3.2.1.tar.bz2
deleted file mode 100644
index 2fe9ede..0000000
--- a/aqbanking-3.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-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 1e8172e..577f716 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 = $(qbanking_internal_libs) $(aqhbci_internal_libs) \
--  -L$(top_builddir)/src/plugins/backends/aqhbci/plugin
-+liblogmanager_la_LIBADD = $(qbanking_internal_libs) $(aqhbci_internal_libs)
+-liblogmanager_la_LIBADD = \
+-  -L$(top_builddir)/src/plugins/backends/aqhbci/plugin $(aqhbci_internal_libs)
++liblogmanager_la_LIBADD = $(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
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,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
-@@ -150,7 +150,7 @@
+@@ -125,7 +125,7 @@
  else
  noinst_PROGRAMS=mkdeinfo
  mkdeinfo_SOURCES=mkdeinfo.c
diff --git a/aqbanking.changes b/aqbanking.changes
index 794a3bd..a08cd8d 100644
--- a/aqbanking.changes
+++ b/aqbanking.changes
@@ -1,20 +1,23 @@
 -------------------------------------------------------------------
-Thu Feb 21 10:29:12 CET 2008 - ro@suse.de
+Thu Feb 28 16:02:38 CET 2008 - ro@suse.de
 
-- devel package: require libchipcard4-devel instead of
-  libchipcard-devel 
-
--------------------------------------------------------------------
-Thu Feb 21 02:25:07 CET 2008 - ro@suse.de
-
-- disable yellownet plugin as well 
-
--------------------------------------------------------------------
-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
+- update to 2.3.3 (last in 2.3 series)
+  - Very minor improvements: One windows function signature has been
+    fixed. DTAUS export has been improved. Error messages at
+    aqbanking-tool have been improved.
+- update to 2.3.2
+  - Windows registry lookup issues have been solved.  This release is only
+    interesting for windows users.
+- update to 2.3.1
+  - Fix translations when using qt4, especially on Windows. Improve
+    cross-compiling. (This release brings no changes for the conventional
+    qt3 compile.)
+- update to 2.3.0
+  - Fix some path lookup issues on MS Windows. Fix a crash with erroneous
+    bank codes. Fix check function in PIN/TAN mode. Improved
+    aqhbci-tool. Add a function for easier initial setup (hence the
+    incremented version number).
+- disabled ofx backend build (incompatible with current libofx)
 
 -------------------------------------------------------------------
 Thu Jan 24 11:16:17 CET 2008 - coolo@suse.de
diff --git a/aqbanking.spec b/aqbanking.spec
index 8a7db7f..4929027 100644
--- a/aqbanking.spec
+++ b/aqbanking.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package aqbanking (Version 3.2.1)
+# spec file for package aqbanking (Version 2.3.3)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -10,11 +10,15 @@
 
 # norootforbuild
 
+%define build_ofx 0
 
 Name:           aqbanking
-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:        3
+BuildRequires:  doxygen fdupes gtk2-devel gwenhywfar-devel kdelibs3-devel ktoblzcheck-devel libchipcard3 libchipcard3-devel libglade2-devel python-devel pyxml qt3-devel
+%if %build_ofx
+BuildRequires:  libofx-devel
+%endif
+Version:        2.3.3
+Release:        1
 Requires:       %{name}-lang = %{version}
 Url:            http://www.aquamaniac.de/aqbanking/
 Group:          Productivity/Office/Finance
@@ -25,7 +29,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/20
+%define aq_plugindir   %{_libdir}/aqbanking/plugins/16
 %define fronts_libdir  %{aq_plugindir}/frontends
 %define imex_plugindir %{aq_plugindir}/imexporters
 %define imex_datadir   %{_datadir}/%{name}/imexporters
@@ -46,7 +50,10 @@ Authors:
 %package devel
 Summary:        Library for Online Banking Functions and Financial Data Import/Export
 Group:          Productivity/Office/Finance
-Requires:       %{name} = %{version} glibc-devel gtk2-devel gwenhywfar-devel kdelibs3-devel ktoblzcheck-devel libchipcard4-devel libglade2-devel libofx-devel qt3-devel
+Requires:       %{name} = %{version} glibc-devel gtk2-devel gwenhywfar-devel kdelibs3-devel ktoblzcheck-devel libchipcard3-devel libglade2-devel qt3-devel
+%if %build_ofx
+Requires:       libofx-devel
+%endif
 
 %description devel
 AqBanking is a generic OnlineBanking interface. It allows multiple
@@ -123,6 +130,8 @@ Authors:
 --------
     Martin Preuss <martin@libchipcard.de>
 
+%if %build_ofx
+
 %package ofx
 Summary:        Library for Online Banking Functions and Financial Data Import/Export
 Group:          Productivity/Office/Finance
@@ -155,6 +164,8 @@ Authors:
 --------
     Martin Preuss <martin@libchipcard.de>
 
+%endif
+
 %package geldkarte
 Summary:        Library for Online Banking Functions and Financial Data Import/Export
 Group:          Productivity/Office/Finance
@@ -232,21 +243,22 @@ Authors:
 %patch2
 
 %build
+BACKEND_LIST="aqdtaus aqgeldkarte aqhbci aqnone"
+%if %build_ofx
+BACKEND_LIST="$BACKEND_LIST aqofxconnect"
+%endif
+%ifarch %ix86
+BACKEND_LIST="$BACKEND_LIST aqyellownet"
+%endif
 ACLOCAL="aclocal -I m4" autoreconf -f -i
 %configure\
 	--enable-release\
-%ifarch %ix86
-	--with-backends="aqhbci aqnone aqofxconnect"\
-%else
-	--with-backends="aqhbci aqnone aqofxconnect"\
-%endif
+	--with-backends="$BACKEND_LIST" \
 	--enable-python\
 	--enable-full-doc\
 	--with-docpath=%{_docdir}/%{name} \
 	--with-qt3-libs=/usr/lib/qt3/%{_lib} \
 	--with-kde3-libs=/opt/kde3/%{_lib}
-# disabled backends x86: aqdtaus aqgeldkarte aqyellownet
-# disabled backends: aqdtaus aqgeldkarte
 # Does not work with aqbanking-2.2.9:
 #make %{?jobs:-j%jobs}
 make
@@ -254,7 +266,7 @@ make
 %install
 %makeinstall idatadir=%{_docdir}/%{name}
 cp -a AUTHORS COPYING ChangeLog NEWS README TODO $RPM_BUILD_ROOT%{_docdir}/%{name}
-rm -fv $RPM_BUILD_ROOT%{_libdir}/aqbanking/plugins/*/bankinfo/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/aqbanking/plugins/16/bankinfo/*.la
 %find_lang %{name}
 %fdupes $RPM_BUILD_ROOT
 
@@ -276,10 +288,12 @@ rm -rf $RPM_BUILD_ROOT
 %post qt3 -p /sbin/ldconfig
 
 %postun qt3 -p /sbin/ldconfig
+%if %build_ofx
 
 %post ofx -p /sbin/ldconfig
 
 %postun ofx -p /sbin/ldconfig
+%endif
 
 %post geldkarte -p /sbin/ldconfig
 
@@ -289,18 +303,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.*
@@ -309,24 +323,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-tool3
+%{_bindir}/aqhbci-tool
 %{_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
@@ -344,6 +358,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{imex_datadir}/xmldb/profiles
 %dir %{imex_datadir}/yellownet
 %dir %{imex_datadir}/yellownet/profiles
+%if !%build_ofx
+%{imex_datadir}/ofx
+%endif
 
 %files lang -f %name.lang
 
@@ -355,43 +372,47 @@ 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}/hbcixml3
+%{_bindir}/hbcixml2
 %{_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
+%if %build_ofx
 ### The ofx files
 %{_includedir}/aqofxconnect
-#%ifarch %ix86
+%endif
+%ifarch %ix86
 ### The yellownet files
-#%{_includedir}/aqyellownet
-#%endif
+%{_includedir}/aqyellownet
+%endif
 # .so files from sub-packages
 %{_libdir}/libqbanking.so
-#%{_libdir}/libg2banking.so
-#%{_libdir}/libkbanking.so
+%{_libdir}/libg2banking.so
+%{_libdir}/libkbanking.so
+%if %build_ofx
 %{_libdir}/libaqofxconnect.so
-#%{_libdir}/libaqgeldkarte.so
+%endif
+%{_libdir}/libaqgeldkarte.so
 
 %files -n python-aqbanking
 %defattr(-,root,root)
@@ -399,21 +420,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files qt3
 %defattr(-,root,root)
-%{_bindir}/qb-help5
+%{_bindir}/qb-help
 %{_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.*
+%if %build_ofx
 
 %files ofx
 %defattr(-,root,root)
@@ -426,39 +450,51 @@ rm -rf $RPM_BUILD_ROOT
 %files ofx-qt3
 %defattr(-,root,root)
 %{qb_cfgmoddir}/aqofxconnect*
-#%files geldkarte
-#%defattr(-,root,root)
+%endif
+
+%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*
-#%ifarch %ix86
-#
-#%files yellownet
-#%defattr(-,root,root)
-#%doc src/plugins/backends/aqyellownet/plugin/COPYING
-##%{_bindir}/aqyellownet-config
-#%{_libdir}/libaqyellownet.so
-#%{aq_plugindir}/providers/aqyellownet.*
-#
-#%files yellownet-qt3
-#%defattr(-,root,root)
-#%{qb_cfgmoddir}/aqyellownet*
-#%endif
+%{_libdir}/libaqgeldkarte.so.*
+%{_includedir}/aqgeldkarte
+%{aq_plugindir}/providers/aqgeldkarte.*
+
+%files geldkarte-qt3
+%defattr(-,root,root)
+%{qb_cfgmoddir}/aqgeldkarte*
+%ifarch %ix86
+
+%files yellownet
+%defattr(-,root,root)
+%doc src/plugins/backends/aqyellownet/plugin/COPYING
+#%{_bindir}/aqyellownet-config
+%{_libdir}/libaqyellownet.so
+%{aq_plugindir}/providers/aqyellownet.*
+
+%files yellownet-qt3
+%defattr(-,root,root)
+%{qb_cfgmoddir}/aqyellownet*
+%endif
 
 %changelog
-* Thu Feb 21 2008 ro@suse.de
-- devel package: require libchipcard4-devel instead of
-  libchipcard-devel
-* Thu Feb 21 2008 ro@suse.de
-- disable yellownet plugin as well
-* 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 Feb 28 2008 ro@suse.de
+- update to 2.3.3 (last in 2.3 series)
+  - Very minor improvements: One windows function signature has been
+  fixed. DTAUS export has been improved. Error messages at
+  aqbanking-tool have been improved.
+- update to 2.3.2
+  - Windows registry lookup issues have been solved.  This release is only
+  interesting for windows users.
+- update to 2.3.1
+  - Fix translations when using qt4, especially on Windows. Improve
+  cross-compiling. (This release brings no changes for the conventional
+  qt3 compile.)
+- update to 2.3.0
+  - Fix some path lookup issues on MS Windows. Fix a crash with erroneous
+  bank codes. Fix check function in PIN/TAN mode. Improved
+  aqhbci-tool. Add a function for easier initial setup (hence the
+  incremented version number).
+- disabled ofx backend build (incompatible with current libofx)
 * Thu Jan 24 2008 coolo@suse.de
 - fix open call
 * Wed Aug 08 2007 maw@suse.de