diff --git a/latex2html-buildroot.diff b/latex2html-buildroot.diff
new file mode 100644
index 0000000..3ae3ca4
--- /dev/null
+++ b/latex2html-buildroot.diff
@@ -0,0 +1,14 @@
+--- config/install.pl
++++ config/install.pl
+@@ -372,7 +372,10 @@
+ 
+ if($cfg{TEXPATH}) {
+   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+-  unless(mkpath($cfg{TEXPATH})) {
++  my $dest = $cfg{TEXPATH};
++  my $buildroot=$ENV{"RPM_BUILD_ROOT"};
++  $dest= "$buildroot$dest";
++  unless(mkpath($dest)) {
+   #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
+   #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
+   #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
diff --git a/latex2html.changes b/latex2html.changes
index ac66cca..b6c29e8 100644
--- a/latex2html.changes
+++ b/latex2html.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 12 01:21:56 CET 2007 - ro@suse.de
+
+- fix build as non-root 
+
 -------------------------------------------------------------------
 Wed Jan 25 21:46:50 CET 2006 - mls@suse.de
 
diff --git a/latex2html.spec b/latex2html.spec
index 8a0eeab..b15db7f 100644
--- a/latex2html.spec
+++ b/latex2html.spec
@@ -1,46 +1,46 @@
 #
 # spec file for package latex2html (Version 2002.2.1)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
-Name:         latex2html
-BuildRequires: ghostscript-fonts-std ghostscript-x11 glib libpng-devel libtiff-devel netpbm te_ams te_latex xorg-x11 xorg-x11-devel
+Name:           latex2html
+BuildRequires:  ghostscript-fonts-std ghostscript-x11 glib libpng-devel libtiff-devel netpbm te_ams te_latex xorg-x11 xorg-x11-devel
 %define share_dir /usr/share/latex2html
-Obsoletes:    l2h l2hhtml
-Provides:     l2h
-URL:          http://www.latex2html.org
-License:      Contact author
-Group:        Productivity/Publishing/TeX/Utilities
-Provides:     l2h99_1 
-Requires:     tetex te_latex netpbm perl ghostscript_any glib latex2html-pngicons
-Autoreqprov:  on
-Version:      2002.2.1
-Release:      364
-Summary:      LaTeX2HTML converter
+Obsoletes:      l2h l2hhtml
+Provides:       l2h
+URL:            http://www.latex2html.org/
+License:        Contact author
+Group:          Productivity/Publishing/TeX/Utilities
+Provides:       l2h99_1 
+Requires:       tetex te_latex netpbm perl ghostscript_any glib latex2html-pngicons
+Autoreqprov:    on
+Version:        2002.2.1
+Release:        413
+Summary:        LaTeX2HTML Converter
 BuildArchitectures: noarch
-Source:       latex2html-%{version}.tar.bz2
-Source1:      latex2html-manual.ps.gz
-Source2:      latex2html-manual.tar.bz2
-Source3:      latex2html-README.SuSE
-Patch:        latex2html-%{version}.diff
-Patch1:       latex2html-%{version}-binmode.diff
-Patch2:       latex2html-2002-2-1-gsout.diff
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Source:         latex2html-%{version}.tar.bz2
+Source1:        latex2html-manual.ps.gz
+Source2:        latex2html-manual.tar.bz2
+Source3:        latex2html-README.SuSE
+Patch:          latex2html-%{version}.diff
+Patch1:         latex2html-%{version}-binmode.diff
+Patch2:         latex2html-2002-2-1-gsout.diff
+Patch3:         latex2html-buildroot.diff
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-LaTeX2HTML lets you easily convert not too complex LaTeX-documents into
-the WWW format HTML. This enables one to have both a written and online
-version of even older LaTeX texts.
+LaTeX2HTML lets you easily convert basic LaTeX documents into the HTML
+format. This allows both a written and online version even of older
+LaTeX texts.
 
-Documentation may be found in:
-
-/usr/share/doc/packages/latex2html
+Find documentation in /usr/share/doc/packages/latex2html.
 
 
 
@@ -51,10 +51,10 @@ Authors:
     Ross Moore <ross@mpce.mq.edu.au>
 
 %package pngicons
-Provides:     l2h-pngicons
-Obsoletes:    l2h-pngicons
-Group:        Productivity/Publishing/TeX/Utilities
-Summary:      Icons in the PNG format for the LaTeX to HTML Converter
+Provides:       l2h-pngicons
+Obsoletes:      l2h-pngicons
+Group:          Productivity/Publishing/TeX/Utilities
+Summary:        Icons in the PNG format for the LaTeX to HTML Converter
 
 %description pngicons
 Icons in the PNG format for the LaTeX to HTML Converter.
@@ -73,6 +73,7 @@ Authors:
 %patch
 %patch1
 %patch2
+%patch3
 cp %{S:1} manual.ps.gz
 cp %{S:3} README.SuSE
 
@@ -129,11 +130,14 @@ touch var/adm/SuSEconfig/run-texhash
 %{_mandir}/man1/latex2html*
 
 %files pngicons
+%defattr(-, root, root)
 %dir %{share_dir}
 %dir %{share_dir}/icons
 %{share_dir}/icons/*.png
 
 %changelog -n latex2html
+* Mon Feb 12 2007 - ro@suse.de
+- fix build as non-root
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Sat Feb 19 2005 - ro@suse.de
@@ -210,7 +214,7 @@ touch var/adm/SuSEconfig/run-texhash
 - added touch var/adm/SuSEconfig/run-texhash to %%post
 * Tue Jun 10 1997 - maddin@suse.de
 - reordered the directory structure
-- latex2html now sits partly in /var/lib/latex2html (writable part) and
+  - latex2html now sits partly in /var/lib/latex2html (writable part) and
   /usr/lib/latex2html (read-only part)
 - made absolute links relative ones
 - removed some links