diff --git a/.cvsignore b/.cvsignore
index 0f360e6..ae8fe7b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-unixODBC-2.0.7.tar.gz
+unixODBC-2.2.0.tar.gz
diff --git a/DataManager.desktop b/DataManager.desktop
index e324138..5a1d30e 100644
--- a/DataManager.desktop
+++ b/DataManager.desktop
@@ -3,6 +3,6 @@ Name=DataManager
 Comment=Application finder
 Exec=DataManager
 Icon=LinuxODBC.xpm
-MiniIcon=smallLinuxODBC.xpm
+MiniIcon=odbc.xpm
 Type=Application
 Terminal=0
diff --git a/ODBCConfig.desktop b/ODBCConfig.desktop
index 33877e5..97c734f 100644
--- a/ODBCConfig.desktop
+++ b/ODBCConfig.desktop
@@ -3,6 +3,6 @@ Name=ODBCConfig
 Comment=Application finder
 Exec=ODBCConfig
 Icon=LinuxODBC.xpm
-MiniIcon=smallLinuxODBC.xpm
+MiniIcon=odbc.xpm
 Type=Application
 Terminal=0
diff --git a/sources b/sources
index b2ea50d..50f90c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ed9e82587a04c56b7e248c1c61de9c0  unixODBC-2.0.7.tar.gz
+ef280d18e855b55592a2472679382008  unixODBC-2.2.0.tar.gz
diff --git a/unixODBC.spec b/unixODBC.spec
index 516de5f..d7430ed 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
-Version: 2.0.7
-Release: 4
+Version: 2.2.0
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ URL: http://www.unixODBC.org/
 Conflicts: iodbc
 BuildPrereq: kdelibs-devel qt-devel libmng-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+ExclusiveArch: i386
 
 %description
 Install unixODBC if you want to access databases through ODBC. This
@@ -61,23 +62,25 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons
 
 %makeinstall
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
-cp ODBCConfig/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons
-cp ODBCConfig/smallLinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
-install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
+install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
+install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/System
+cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons
+cp DataManager/odbc.xpm $RPM_BUILD_ROOT%{_datadir}/icons
+find $RPM_BUILD_ROOT/%{_libdir} -name "*.so*" |sed "s|$RPM_BUILD_ROOT||" |grep -v libodbcinstQ > foo-list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f foo-list
 %defattr(-,root,root)
 %doc README COPYING AUTHORS ChangeLog NEWS INSTALL doc
 %config(noreplace) %{_sysconfdir}/odbc*
-%{_libdir}/*so.*
+#{_libdir}/*so.*
 %{_bindir}/odbcinst
 %{_bindir}/isql
 %{_bindir}/dltest
+#{_libdir}/libodbcinstQ*
 
 %files devel
 %defattr(-,root,root)
@@ -90,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/ODBCConfig
 %{_bindir}/DataManager
 /etc/X11/applnk/System/*
+%{_libdir}/libodbcinstQ*
 
 %post kde -p /sbin/ldconfig
 %postun kde -p /sbin/ldconfig
@@ -100,6 +104,23 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Mar  8 2002 Bernhard Rosenkraenzer <bero@redhat.com> 2.2.0-2
+- Rebuild with KDE 3.x
+
+* Tue Feb 26 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.2.0-1
+- Just build on i386 now, there are 64 bit oddities 
+- 2.2.0
+
+* Fri Jan 11 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.1.1-2
+- move libodbcinstQ* to the kde subpackage
+
+* Fri Jan 11 2002 Trond Eivind Glomsrød <teg@redhat.com> 2.1.1-1
+- 2.1.1
+- minor cleanups
+
+* Fri Dec 14 2001 Trond Eivind Glomsrød <teg@redhat.com> 2.0.7-5
+- Rebuild
+
 * Wed Sep 12 2001 Tim Powers <timp@redhat.com>
 - rebuild with new gcc and binutils