diff --git a/.cvsignore b/.cvsignore
index 3a3de69..869fabf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1,3 @@
-l2h-2002-2-1+jp2.0.patch.gz
-latex2html-2002-2-1.tar.bz2
-latex2html-manpages.tar.bz2
-latex2html-2002-2-1.tar.gz
-l2h-2K2-2-1+jp2.1b1.6.patch.gz
+latex2html-2008.tar.gz
+l2h-2K8-jp20081220.tar.gz
 latex2html-manpages.tar.gz
diff --git a/cfgcache.pm b/cfgcache.pm
index 4cdfbc2..7a4b503 100644
--- a/cfgcache.pm
+++ b/cfgcache.pm
@@ -11,10 +11,13 @@ require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(%cfg);
 
+$cfg{'ANYTOPNM'} = q'/usr/bin/anytopnm';
 $cfg{'BINDIR'} = q'/usr/bin';
+$cfg{'BMPTOPPM'} = q'/usr/bin/bmptoppm';
 $cfg{'CRAYOLAFILE'} = q'/usr/share/latex2html/styles/crayola.txt';
 $cfg{'DVIPS'} = q'/usr/bin/dvips';
 $cfg{'DVIPSOPT'} = q' -E';
+$cfg{'GIFTOPNM'} = q'/usr/bin/giftopnm';
 $cfg{'GS'} = q'/usr/bin/gs';
 $cfg{'GSALIASDEVICE'} = q'ppmraw';
 $cfg{'GSDEVICE'} = q'pnmraw';
@@ -23,40 +26,58 @@ $cfg{'GS_LIB'} = q'';
 $cfg{'HASHBANG'} = q'1';
 $cfg{'HTML_VALIDATOR'} = q'';
 $cfg{'ICONPATH'} = q'file:/usr/share/latex2html/icons';
+$cfg{'ICONSERVER'} = q'';
 $cfg{'ICONSTORAGE'} = q'';
 $cfg{'IMAGE_TYPES'} = q'png gif';
 $cfg{'INITEX'} = q'/usr/bin/initex';
+$cfg{'JPEGTOPNM'} = q'/usr/bin/jpegtopnm';
 $cfg{'KPSEWHICH'} = q'/usr/bin/kpsewhich';
 $cfg{'LATEX'} = q'/usr/bin/latex';
 $cfg{'LATEX2HTMLDIR'} = q'/usr/share/latex2html';
+$cfg{'LATEX2HTMLPLATDIR'} = q'/usr/share/latex2html';
 $cfg{'LIBDIR'} = q'/usr/share/latex2html';
 $cfg{'METADPI'} = q'0';
 $cfg{'METAMODE'} = q'';
 $cfg{'MKTEXLSR'} = q'/usr/bin/mktexlsr';
 $cfg{'NULLFILE'} = q'/dev/null';
 $cfg{'PBMMAKE'} = q'/usr/bin/pbmmake';
+$cfg{'PCXTOPPM'} = q'/usr/bin/pcxtoppm';
 $cfg{'PERL'} = q'/usr/bin/perl';
 $cfg{'PERLFOOTER'} = q'';
 $cfg{'PERLHEADER'} = <<'EOQ';
 #! /usr/bin/perl -w
 EOQ
 $cfg{'PERLSCRIPTDIR'} = q'/usr/bin';
+$cfg{'PICTTOPPM'} = q'';
 $cfg{'PK_GENERATION'} = q'0';
+$cfg{'PNGTOPNM'} = q'/usr/bin/pngtopnm';
+$cfg{'PNMBLACK'} = q'';
 $cfg{'PNMCAT'} = q'/usr/bin/pnmcat';
 $cfg{'PNMCROP'} = q'/usr/bin/pnmcrop';
+$cfg{'PNMCROPOPT'} = q' -sides ';
+$cfg{'PNMCUT'} = q'/usr/bin/pnmcut';
 $cfg{'PNMFILE'} = q'/usr/bin/pnmfile';
 $cfg{'PNMFLIP'} = q'/usr/bin/pnmflip';
+$cfg{'PNMPAD'} = q'/usr/bin/pnmpad';
+$cfg{'PNMROTATE'} = q'/usr/bin/pnmrotate';
+$cfg{'PNMSCALE'} = q'/usr/bin/pnmscale';
 $cfg{'PNMTOPNG'} = q'/usr/bin/pnmtopng';
 $cfg{'PPMQUANT'} = q'/usr/bin/ppmquant';
 $cfg{'PPMTOGIF'} = q'/usr/bin/ppmtogif';
+$cfg{'PPMTOJPEG'} = q'/usr/bin/ppmtojpeg';
 $cfg{'PREFIX'} = q'/usr';
 $cfg{'RGBCOLORFILE'} = q'/usr/share/X11/rgb.txt';
+$cfg{'SGITOPNM'} = q'/usr/bin/sgitopnm';
+$cfg{'SHLIBDIR'} = q'/usr/share/latex2html';
 $cfg{'TEX'} = q'/usr/bin/tex';
 $cfg{'TEXPATH'} = q'/usr/share/texmf/tex/latex/html';
+$cfg{'TIFFTOPNM'} = q'/usr/bin/tifftopnm';
 $cfg{'TMPSPACE'} = q'/tmp';
 $cfg{'WEB2C'} = q'1';
+$cfg{'XBMTOPBM'} = q'/usr/bin/xbmtopbm';
+$cfg{'XWDTOPNM'} = q'/usr/bin/xwdtopnm';
 $cfg{'dd'} = q'/';
-$cfg{'distver'} = q'2K.1beta';
+$cfg{'distver'} = q'2008';
 $cfg{'exec_extension'} = q'';
 $cfg{'gif_interlace'} = q'netpbm';
 $cfg{'gif_trans'} = q'netpbm';
@@ -69,7 +90,7 @@ $cfg{'pipes'} = q'1';
 $cfg{'plat'} = q'unix';
 $cfg{'scriptdir'} = q'/usr/bin';
 $cfg{'scriptext'} = q'';
-$cfg{'srcdir'} = q'/X/tetex/teTeX-1.0/latex2html-2K.1beta';
+$cfg{'srcdir'} = q'/X/latex2html-2008';
 $cfg{'texlive'} = q'0';
 $cfg{'wrapper'} = q'0';
 
diff --git a/latex2html.spec b/latex2html.spec
index d04f6e5..d4a3141 100644
--- a/latex2html.spec
+++ b/latex2html.spec
@@ -1,30 +1,26 @@
 %define enable_japanese 1
-%define latex2html_ver	2002-2-1
 
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
-Version: 2002.2.1
-Release: 8%{?dist}
-License: Free To Use But Restricted (See LICENSE)
+Version: 2008
+Release: 1%{?dist}
+License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
-Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{latex2html_ver}.tar.gz
+# main latex2html source
+Source0: http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/%{name}-%{version}.tar.gz
 Source1: cfgcache.pm
 Source2: %{name}-manpages.tar.gz
+# support for Japanese
+Source3: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/current/data/l2h-2K8-jp20081220.tar.gz
 Patch0: latex2html-2K.1beta-tabularx.patch
 Patch1: teTeX-l2h-config.patch
 Patch3: latex2html-2K.1beta-DB.patch
 Patch4: latex2html-2002-2-1-SHLIB.patch
 Patch5: latex2html-2002-2-1-gsfont.patch
 Patch6: latex2html-2002.2.1-grayimg.patch
-
-###
-# Japanization patches
-###
-Patch100: http://takeno.iee.niit.ac.jp/~shige/TeX/latex2html/current/data/l2h-2K2-2-1+jp2.1b1.6.patch.gz
-
-Requires: tetex-latex, tetex-dvips
-BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tetex-latex
+Requires: tex(latex), tex(dvips)
+BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm >= 9.21, tex(latex)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -39,7 +35,7 @@ pages are generated from a single LATEX source.
 %prep
 %setup -q -n %{name}-%{version} -c -a 0
 
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 # patch latex2html to support tabularx environments better
 %patch0 -p1 -b .tabularx
 
@@ -62,21 +58,20 @@ done
 popd
 
 %if %{enable_japanese}
-cp -a %{name}-%{latex2html_ver} %{name}-%{latex2html_ver}JA
-pushd %{name}-%{latex2html_ver}JA
-# JA patches for latex2html.
-%patch100 -p1 -b .jp2
+cp -a %{name}-%{version} %{name}-%{version}JA
+pushd %{name}-%{version}JA
+tar fxz %{SOURCE3}
 popd
 %endif
 
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 # don't generate gray images as output from latex2html
 # it's patched here to let the .jp2 patch be cleanly applied
 %patch6 -p1 -b .grayimg
 popd
 
 %build
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 cp %{SOURCE1} cfgcache.pm
 tar fxz %{SOURCE2}
 
@@ -96,13 +91,13 @@ tar fxz %{SOURCE2}
              --infodir=%{_infodir} \
 	     --shlibdir=%{_datadir}/latex2html \
 	     --with-texpath=%{_datadir}/texmf/tex/latex/html
- 
+
 perl -pi -e"s,/usr/(share/)?lib,%{_datadir}," cfgcache.pm
 make
 popd
 
 %if %{enable_japanese}
-pushd %{name}-%{latex2html_ver}JA
+pushd %{name}-%{version}JA
 sed s/latex2html/jlatex2html/g < %{SOURCE1} > cfgcache.pm
 perl -pi -e"s,/usr/bin/dvips,/usr/bin/pdvips," cfgcache.pm
 perl -pi -e"s,/usr/bin/latex,/usr/bin/platex," cfgcache.pm
@@ -140,7 +135,7 @@ popd
 %install
 rm -rf $RPM_BUILD_ROOT
 
-pushd %{name}-%{latex2html_ver}
+pushd %{name}-%{version}
 perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/texexpand,;
             s,/.*\\\${dd}pstoimg,%{_bindir}/pstoimg,;
@@ -164,7 +159,7 @@ install -m0644 *.1 %{buildroot}%{_mandir}/man1
 popd
 
 %if %{enable_japanese}
-pushd %{name}-%{latex2html_ver}JA
+pushd %{name}-%{version}JA
 perl -pi -e"s,%{_prefix},${RPM_BUILD_ROOT}%{_prefix}," cfgcache.pm
 perl -pi -e"s,latex2html pstoimg texexpand,jlatex2html jpstoimg jtexexpand," config/install.pl
 perl -pi -e"s,/.*\\\${dd}texexpand,%{_bindir}/jtexexpand,;
@@ -224,6 +219,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Fri Jan 02 2009 Jindrich Novy <jnovy@redhat.com> 2008
+- update to latex2html-2008
+- license changed to GPL
+- update japanese support to l2h-2K8-jp20081220
+- update cfgcache.pm
+- fix BR
+
 * Mon Jan 07 2008 Jindrich Novy <jnovy@redhat.com> 2002.2.1-8
 - fix post/postun scriptlets
 
diff --git a/sources b/sources
index 5354590..1813810 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a79cda0648c8721ab6df5020cd11e220  latex2html-2002-2-1.tar.gz
-a4f534ef3fc0e0e09a4ddb664beae487  l2h-2K2-2-1+jp2.1b1.6.patch.gz
+275ab6cfa8ca9328446b7f40d8dc302e  latex2html-2008.tar.gz
+7951e334e313a1a88946a1171c72e78f  l2h-2K8-jp20081220.tar.gz
 a27170c02c0f2bc3a524058711e339a4  latex2html-manpages.tar.gz