diff --git a/libksba-1.0.3-multilib.patch b/libksba-1.0.3-multilib.patch
deleted file mode 100644
index 525fb90..0000000
--- a/libksba-1.0.3-multilib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up libksba-1.0.3/src/ksba-config.in.multilib libksba-1.0.3/src/ksba-config.in
---- libksba-1.0.3/src/ksba-config.in.multilib	2006-08-31 03:05:24.000000000 -0500
-+++ libksba-1.0.3/src/ksba-config.in	2008-04-03 11:21:11.000000000 -0500
-@@ -116,9 +116,6 @@ fi
- 
- if test "$echo_libs" = "yes"; then
-     libdirs=""
--    if test "@libdir@" != "/usr/lib" ; then
--      libdirs="-L@libdir@"
--    fi
-     tmp=""
-     for i in $libdirs $libs; do
-        if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then
diff --git a/libksba-1.0.6-multilib.patch b/libksba-1.0.6-multilib.patch
new file mode 100644
index 0000000..c10606c
--- /dev/null
+++ b/libksba-1.0.6-multilib.patch
@@ -0,0 +1,12 @@
+diff -up libksba-1.0.6/src/ksba-config.in.multilib libksba-1.0.6/src/ksba-config.in
+--- libksba-1.0.6/src/ksba-config.in.multilib	2006-08-31 03:05:24.000000000 -0500
++++ libksba-1.0.6/src/ksba-config.in	2009-12-17 07:17:28.312946199 -0600
+@@ -116,7 +116,7 @@ fi
+ 
+ if test "$echo_libs" = "yes"; then
+     libdirs=""
+-    if test "@libdir@" != "/usr/lib" ; then
++    if test "@libdir@" != "/usr/lib" -a "@libdir@" != "/usr/lib32" -a "@libdir@" != "/usr/lib64" ; then
+       libdirs="-L@libdir@"
+     fi
+     tmp=""
diff --git a/libksba.spec b/libksba.spec
index e3aa1cc..ef36aa0 100644
--- a/libksba.spec
+++ b/libksba.spec
@@ -2,7 +2,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv3
 Group:   System Environment/Libraries
@@ -11,8 +11,7 @@ Source0: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2
 Source1: ftp://ftp.gnupg.org/gcrypt/libksba/libksba-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# quick-n-dirty hack to ksba-config, TODO: consider using pkgconfig instead
-Patch1: libksba-1.0.3-multilib.patch
+Patch1: libksba-1.0.6-multilib.patch
 
 BuildRequires: gawk
 # >= 1.4 preferred
@@ -86,12 +85,16 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/ksba-config
 %{_libdir}/libksba.so
-%{_includedir}/*
-%{_datadir}/aclocal/*
-%{_infodir}/*
+%{_includedir}/ksba.h
+%{_datadir}/aclocal/ksba.m4
+%{_infodir}/ksba.info*
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.6-4
+- better (upstreamable) multilib patch
+- tighten %%files a bit
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.0.6-3
 - Convert specfile to UTF-8.