diff --git a/libmtp.spec b/libmtp.spec
index 275ac96..7a6c0af 100644
--- a/libmtp.spec
+++ b/libmtp.spec
@@ -17,7 +17,8 @@ Requires:       udev
 BuildRequires:  libusb1-devel
 BuildRequires:  doxygen
 BuildRequires:  libgcrypt-devel
-Obsoletes:	libmtp-hal
+BuildRequires:  chrpath
+Obsoletes:      libmtp-hal
 
 %description
 This package provides a software library for communicating with MTP
@@ -50,7 +51,7 @@ library for MTP media players.
 
 %build
 %configure --disable-static \
-	   --with-udev-rules=69-libmtp.rules
+           --with-udev-rules=69-libmtp.rules
 make %{?_smp_mflags}
 
 %install
@@ -71,6 +72,9 @@ ln -sf mtp-connect mtp-newfolder
 ln -sf mtp-connect mtp-sendfile
 ln -sf mtp-connect mtp-sendtr
 popd
+# Convert COPYING file to UTF-8
+iconv -f iso-8859-1 -t utf-8 -o COPYING.utf8 COPYING
+touch -r COPYING COPYING.utf8; mv -f COPYING.utf8 COPYING
 # Copy documentation to a good place
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_pkgdocdir}
 install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
@@ -81,7 +85,9 @@ mv $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html \
 # Touch generated files to make them always have the same time stamp.
 touch -r configure.ac \
       $RPM_BUILD_ROOT%{_includedir}/*.h \
-      $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc \
+      $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc
+# Get rid of -rpath
+chrpath --delete $RPM_BUILD_ROOT{%{_bindir},/lib/udev}/mtp*
 
 %clean
 rm -rf $RPM_BUILD_ROOT