diff --git a/unixODBC.spec b/unixODBC.spec
index c789d61..ff154d3 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.8
-Release: 3
+Release: 5
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@ Source3: DataManager.desktop
 Patch1: depcomp.patch
 Patch2: rename-lo.patch
 Patch3: installedltdl.patch
+Patch4: doublefree.patch
 URL: http://www.unixODBC.org/
 Conflicts: iodbc
 BuildPrereq: kdelibs-devel qt-devel libmng-devel XFree86-devel automake autoconf libtool
@@ -37,7 +38,7 @@ ODBC, you need to install this package.
 %package kde
 Summary: KDE driver manager components for ODBC.
 Group: System Environment/Libraries
-Requires: qt >= 2.1
+Requires: qt >= 2.1  %{name} >= %{version}
 
 %description kde
 This package contains components for the ODBCConfig and DataManager
@@ -48,6 +49,7 @@ This package contains components for the ODBCConfig and DataManager
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # 2.2.8 includes a libtool that is too old for some of our architectures.
 # Blow it away and replace with build system's libtool.  (We intend to use
@@ -157,6 +159,16 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat May  8 2004 Tom Lane <tgl@redhat.com> 2.2.8-5
+- Backpatch fix for double-free error from upstream devel sources.
+- rebuilt
+
+* Wed May  5 2004 Tom Lane <tgl@redhat.com> 2.2.8-4
+- Add dependency to ensure kde subpackage stays in sync with main
+  (needed because we moved odbctest from one pkg to the other,
+  cf bug #122478)
+- rebuilt
+
 * Wed Mar 10 2004 Tom Lane <tgl@redhat.com> 2.2.8-3
 - Use installed libltdl
 - rebuilt for Fedora Core 2