diff --git a/linuxdoc-tools.spec b/linuxdoc-tools.spec
index b16391c..b868066 100644
--- a/linuxdoc-tools.spec
+++ b/linuxdoc-tools.spec
@@ -1,9 +1,10 @@
-%{!?tetex:%define tetex 1}
+%{!?tetex:%global tetex 1}
+%global _vendorperllibdir %{_datadir}/perl5/vendor_perl
 
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
 Version: 0.9.66
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: Copyright only
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
@@ -53,12 +54,11 @@ perl -pi -e 's,\$main::prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat
 
 %install
 rm -rf $RPM_BUILD_ROOT
-eval `perl '-V:installvendorlib'`
-mkdir -p $RPM_BUILD_ROOT/$installvendorlib
-make install DESTDIR=$RPM_BUILD_ROOT perl5libdir=$installvendorlib
+mkdir -p $RPM_BUILD_ROOT/%{_vendorperllibdir}
+make install DESTDIR=$RPM_BUILD_ROOT perl5libdir=%{_vendorperllibdir}
 mv $RPM_BUILD_ROOT%{_docdir}/%{name} $RPM_BUILD_ROOT%{_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,' \
-           $RPM_BUILD_ROOT$installvendorlib/LinuxDocTools.pm
+           $RPM_BUILD_ROOT%{_vendorperllibdir}/LinuxDocTools.pm
 #Copy license files for parts into docdir
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sgmls-1.1
 cp -p sgmls-1.1/LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/sgmls-1.1/LICENSE
@@ -94,14 +94,18 @@ exit 0
 %{_datadir}/%{name}
 %{_datadir}/entity-map
 %{_datadir}/texmf/tex/latex/misc/*.sty
-%dir %{_datadir}/perl5/vendor_perl/Text
-%{_datadir}/perl5/vendor_perl/Text/EntityMap.pm
-%dir %{_datadir}/perl5/vendor_perl/LinuxDocTools
-%{_datadir}/perl5/vendor_perl/LinuxDocTools.pm
-%{_datadir}/perl5/vendor_perl/LinuxDocTools/*.pm
+%dir %{_vendorperllibdir}/Text
+%{_vendorperllibdir}/Text/EntityMap.pm
+%dir %{_vendorperllibdir}/LinuxDocTools
+%{_vendorperllibdir}/LinuxDocTools.pm
+%{_vendorperllibdir}/LinuxDocTools/*.pm
 %{_mandir}/*/*
 
 %changelog
+* Fri Dec 10 2010 Ondrej Vasik <ovasik@redhat.com> 0.9.66-8
+- make the dependency on perl vendor lib location more stable
+- use global macro instead of define macro
+
 * Mon Dec 06 2010 Ondrej Vasik <ovasik@redhat.com> 0.9.66-7
 - fix perl vendor lib location(FTBS)
 - BuildRequire flex-static as we need libfl