diff --git a/gphoto2.spec b/gphoto2.spec
index 4472259..d41ce3f 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -5,7 +5,7 @@ Name: gphoto2
 %define libpkg libgphoto2
 %define libver 2.1.5
 Version: %{pkgver}
-Release: 5
+Release: 6
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -80,7 +80,7 @@ pushd %{libpkg}-%{libver}
 %configure --disable-rpath --disable-docs \
 	--with-doc-dir=%{buildroot}%{_docdir}/%{name}
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make
 ln -s . libgphoto2/gphoto2
 ln -s . libgphoto2_port/libgphoto2_port/gphoto2
 popd
@@ -95,7 +95,7 @@ cat $(pwd)/libgphoto2-%{libver}/libgphoto2/libgphoto2.pc | sed \
 export PKG_CONFIG_PATH=.
 %configure --disable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name}
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make
 
 ####################################
 %install
@@ -103,12 +103,8 @@ rm -rf "${RPM_BUILD_ROOT}"
 
 pushd %{libpkg}-%{libver}
 
-# Convince gphoto2 to be packaged.
-perl -p -i -e "s|^libdir.*|libdir='$RPM_BUILD_ROOT%{_libdir}'|g" \
-	libgphoto2_port/libgphoto2_port/libgphoto2_port.la
-
 export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
+%makeinstall
 
 install -d -m755 %{buildroot}/etc/hotplug/usb/
 install -m755 packaging/linux-hotplug/usbcam.console %{buildroot}/etc/hotplug/usb/usbcam
@@ -116,11 +112,7 @@ install -m755 packaging/linux-hotplug/usbcam.console %{buildroot}/etc/hotplug/us
 popd
 
 export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
-
-# Fix up libtool libraries.
-find $RPM_BUILD_ROOT -name '*.la' | \
-  xargs perl -p -i -e "s|$RPM_BUILD_ROOT||g"
+%makeinstall
 
 cp -a %{buildroot}%{_docdir}/%{name} installed-doc
 find installed-doc -name '*.sgml' | xargs -r rm
@@ -202,6 +194,9 @@ fi
 # ChangeLog
 ########################################################################
 %changelog
+* Thu Mar 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.1.5-6
+- Avoid creation of bad rpaths by removing libtool hacks from spec.
+
 * Thu Mar 24 2005 Tim Waugh <twaugh@redhat.com>
 - Disable docs again until gtk-doc is fixed (GNOME bug #169087).