diff --git a/libidn.spec b/libidn.spec
index a8d924f..114bc74 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,13 +1,13 @@
 Summary: Internationalized Domain Name support library
 Name: libidn
 Version: 0.6.14
-Release: 4
-URL: http://www.gnu.org/software/libidn
+Release: 5
+URL: http://www.gnu.org/software/libidn/
 License: LGPLv2+
 Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pkgconfig, gettext
+BuildRequires: pkgconfig, gettext, libtool, autoconf
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires(postun): /sbin/ldconfig
@@ -35,7 +35,12 @@ developing programs which use the GNU libidn library.
 # Name directory sections consistently in the info file, #209491
 sed -i '/^INFO-DIR-SECTION/{s/GNU Libraries/Libraries/;s/GNU utilities/Utilities/;}' doc/libidn.info
 
+iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp
+mv iconv.tmp doc/libidn.info
+
 %build
+# Must re-bootstrap to get multilib-aware libtool
+autoreconf
 %configure --disable-csharp
 make %{?_smp_mflags}
 
@@ -44,7 +49,7 @@ make %{?_smp_mflags} -C tests check
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # provide more examples
 make %{?_smp_mflags} -C examples distclean
@@ -94,6 +99,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Feb  7 2008 Joe Orton <jorton@redhat.com> 0.6.14-5
+- fix DT_RPATH in /usr/bin/idn
+- convert libidn.iconv to UTF-8 (Jon Ciesla, #226029)
+
 * Tue Aug 21 2007 Joe Orton <jorton@redhat.com> 0.6.14-4
 - drop contrib directory from docs