diff --git a/linuxdoc-tools.spec b/linuxdoc-tools.spec
index db8ca9f..ed3bbb1 100644
--- a/linuxdoc-tools.spec
+++ b/linuxdoc-tools.spec
@@ -41,17 +41,20 @@ documentation.
 %build
 %configure --with-installed-nsgmls --with-installed-iso-entities
 # Packaging brain-damage
-( cd entity-map
-  autoconf
-  %configure
-)
+pushd entity-map
+autoconf
+%configure
+popd
+
 make OPTIMIZE="$RPM_OPT_FLAGS" %{?_smp_mflags}
 perl -pi -e 's,\$main::prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat,/usr/share/sgml/sgml-iso-entities-8879.1986/catalog,' \
            lib/LinuxDocTools.pm
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+eval `perl '-V:installvendorlib'`
+mkdir -p $RPM_BUILD_ROOT/$installvendorlib
+%makeinstall perl5libdir=$RPM_BUILD_ROOT/$installvendorlib
 mv %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
 perl -pi -e 's,/usr/share/sgml/iso-entities-8879.1986/iso-entities.cat,\$main::prefix/share/sgml/sgml-iso-entities-8879.1986/catalog,' \
            %{buildroot}%{_datadir}/%{name}/LinuxDocTools.pm
@@ -88,11 +91,14 @@ exit 0
 %{_datadir}/%{name}
 %{_datadir}/entity-map
 %{_datadir}/texmf/tex/latex/misc/*.sty
-%dir %{_libdir}/perl5/Text
-%{_libdir}/perl5/Text/EntityMap.pm
+%dir %{_prefix}/lib*/perl5/vendor_perl/*/Text
+%{_prefix}/lib*/perl5/vendor_perl/*/Text/EntityMap.pm
 %{_mandir}/*/*
 
 %changelog
+* Mon Jan 31 2005 Tim Waugh <twaugh@redhat.com>
+- Put perl files in the right place (bug #146514).
+
 * Wed Oct  6 2004 Tim Waugh <twaugh@redhat.com> 0.9.20-14
 - Build requires groff (bug #134798).