diff --git a/.cvsignore b/.cvsignore
index e19d988..4e51447 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-linuxdoc-tools_0.9.56.tar.gz
+linuxdoc-tools_0.9.65.tar.gz
diff --git a/linuxdoc-tools-0.9.13-letter.patch b/linuxdoc-tools-0.9.13-letter.patch
index 93d205b..232d130 100644
--- a/linuxdoc-tools-0.9.13-letter.patch
+++ b/linuxdoc-tools-0.9.13-letter.patch
@@ -1,5 +1,5 @@
---- linuxdoc-tools-0.9.13/lib/LinuxDocTools.pm.letter	Mon Nov 26 16:09:37 2001
-+++ linuxdoc-tools-0.9.13/lib/LinuxDocTools.pm	Mon Nov 26 16:09:49 2001
+--- linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm.letter	Mon Nov 26 16:09:37 2001
++++ linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm	Mon Nov 26 16:09:49 2001
 @@ -108,7 +108,7 @@
  			  { option => "pass",      type => "s", short => "P" }
  			  ];
diff --git a/linuxdoc-tools-0.9.20-lib64.patch b/linuxdoc-tools-0.9.20-lib64.patch
index f13638a..66ff2a3 100644
--- a/linuxdoc-tools-0.9.20-lib64.patch
+++ b/linuxdoc-tools-0.9.20-lib64.patch
@@ -1,10 +1,10 @@
---- linuxdoc-tools-0.9.20/bin/linuxdoc.in.orig	2002-09-10 14:31:56.000000000 -0400
-+++ linuxdoc-tools-0.9.20/bin/linuxdoc.in	2002-09-10 14:32:32.000000000 -0400
+--- linuxdoc-tools-0.9.60/bin/linuxdoc.in.orig
++++ linuxdoc-tools-0.9.60/bin/linuxdoc.in
 @@ -23,6 +23,7 @@
+ $AuxBinDir   = "@auxbindir@";
  
- use lib "@DATADIR@";
- use lib "@prefix@/perl5";
+ use lib "@pkgdatadir@";
 +use lib "@prefix@/lib64/perl5";
- use lib "@prefix@/lib/perl5";
- use lib "@prefix@/share/perl5";
+ use lib "@perl5libdir@";
  
+ # ---------------------------------------------------------------------
diff --git a/linuxdoc-tools.spec b/linuxdoc-tools.spec
index 70a0fa2..9ed483a 100644
--- a/linuxdoc-tools.spec
+++ b/linuxdoc-tools.spec
@@ -2,16 +2,16 @@
 
 Summary: A text formatting package based on SGML
 Name: linuxdoc-tools
-Version: 0.9.56
-Release: 2%{?dist}
+Version: 0.9.65
+Release: 1%{?dist}
 License: Freely redistributable without restriction
 Group: Applications/Publishing
 Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.tar.gz
 Patch0: linuxdoc-tools-0.9.13-letter.patch
 Patch1: linuxdoc-tools-0.9.20-lib64.patch
 Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: flex sgml-common jade gawk groff autoconf
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: flex sgml-common jade gawk groff autoconf texinfo
 Requires: jade gawk groff
 # this should anyway be only a "suggest"
 %if %{tetex}
@@ -45,23 +45,23 @@ 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
+           perl5lib/LinuxDocTools.pm
 
 %install
 rm -rf $RPM_BUILD_ROOT
 eval `perl '-V:installvendorlib'`
 mkdir -p $RPM_BUILD_ROOT/$installvendorlib
-%makeinstall perl5libdir=$RPM_BUILD_ROOT/$installvendorlib
-mv %{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}-%{version}
+make install DESTDIR=$RPM_BUILD_ROOT perl5libdir=$installvendorlib
+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,' \
-           %{buildroot}%{_datadir}/%{name}/LinuxDocTools.pm
+           $RPM_BUILD_ROOT$installvendorlib/LinuxDocTools.pm
 
 # Some files need moving around.
-rm -f %{buildroot}%{_datadir}/%{name}/epsf.*
-rm -f %{buildroot}%{_datadir}/%{name}/url.sty
-install -d %{buildroot}%{_datadir}/texmf/tex/latex/misc
-mv %{buildroot}%{_datadir}/%{name}/*.sty \
-  %{buildroot}%{_datadir}/texmf/tex/latex/misc
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/epsf.*
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/url.sty
+install -d $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/misc
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.sty \
+  $RPM_BUILD_ROOT%{_datadir}/texmf/tex/latex/misc
 
 cat > doc/COPYRIGHT <<EOF
 (C) International Organization for Standardization 1986
@@ -90,13 +90,20 @@ exit 0
 %{_datadir}/texmf/tex/latex/misc/*.sty
 %dir %{_prefix}/lib*/perl5/vendor_perl/*/Text
 %{_prefix}/lib*/perl5/vendor_perl/*/Text/EntityMap.pm
+%dir %{_prefix}/lib*/perl5/vendor_perl/*/LinuxDocTools
+%{_prefix}/lib*/perl5/vendor_perl/*/LinuxDocTools.pm
+%{_prefix}/lib*/perl5/vendor_perl/*/LinuxDocTools/*.pm
 %{_mandir}/*/*
 
 %changelog
+* Mon Jun 22 2009 Ondrej Vasik <ovasik@redhat.com> 0.9.65-1
+- Used latest upstream version 0.9.65,
+  reflect changes
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.56-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Dec 03 2008 Ondrej Vasik <ovasik@redhat.com> 0.9-56-1
+* Wed Dec 03 2008 Ondrej Vasik <ovasik@redhat.com> 0.9.56-1
 - Used latest upstream version 0.9.56,
   removed already applied patches
 
diff --git a/sources b/sources
index 3bc3f9a..8188831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1cfe10e279394731b65fdac4f72ff5eb  linuxdoc-tools_0.9.56.tar.gz
+fecf6c3593e7c0961e0356e37e86208a  linuxdoc-tools_0.9.65.tar.gz