diff --git a/unixODBC.spec b/unixODBC.spec
index dc5d3fc..31c1b86 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux.
 Name: unixODBC
 Version: 2.2.11
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
@@ -101,6 +101,15 @@ cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons
 cp DataManager/ODBC.xpm $RPM_BUILD_ROOT%{_datadir}/icons/odbc.xpm
 cp DataManagerII/LinuxODBC.xpm $RPM_BUILD_ROOT/usr/share/icons
 cp DataManagerII/ODBC.xpm $RPM_BUILD_ROOT/usr/share/icons/odbc.xpm
+
+# don't want to install doc Makefiles as docs
+find doc -name 'Makefile*' | xargs rm
+
+# remove unpackaged files from the buildroot
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
+rm -rf $RPM_BUILD_ROOT/usr/share/libtool
+
 find $RPM_BUILD_ROOT/%{_libdir} -name "*.so.*" |sed "s|$RPM_BUILD_ROOT||" |grep  -i -v libodbcinstQ > foo-list
 find $RPM_BUILD_ROOT/%{_libdir} -name "*.so" |sed "s|$RPM_BUILD_ROOT||" |grep  -i -v libodbcinstQ |grep  -v -E "libodbc.so$" |grep  -v -E "libodbcpsqlS?.so$" |grep  -v -E "libodbcmyS.so$" > foo-list2
 
@@ -110,9 +119,6 @@ echo "%{_libdir}/libodbcpsql.so" >> foo-list
 echo "%{_libdir}/libodbcpsqlS.so" >> foo-list
 echo "%{_libdir}/libodbcmyS.so" >> foo-list
 
-# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,8 +133,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/iusql
 %{_bindir}/odbc_config
 #%{_bindir}/odbctest
-
-
 #{_libdir}/libodbcinstQ*
 
 %files devel -f foo-list2
@@ -152,12 +156,14 @@ rm -rf $RPM_BUILD_ROOT
 %post kde -p /sbin/ldconfig
 %postun kde -p /sbin/ldconfig
 
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat Sep 24 2005 Tom Lane <tgl@redhat.com> 2.2.11-2
+- Remove Makefiles accidentally included in docs installation (bz #168819)
+- Updates to keep newer libtool code from installing itself as part of package
+
 * Fri Apr  8 2005 Tom Lane <tgl@redhat.com> 2.2.11-1
 - Update to unixODBC 2.2.11