diff --git a/build-compare.changes b/build-compare.changes
index d750bff..60bdf0b 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed May 12 13:54:59 UTC 2010 - aj@suse.de
+
+- Fix doxygen docu handling.
+
+-------------------------------------------------------------------
+Wed May 12 12:33:02 UTC 2010 - aj@suse.de
+
+- Handle one more GNU Classpath version.
+- Further improve man page regexp.
+
+-------------------------------------------------------------------
+Tue May 11 20:12:59 UTC 2010 - aj@suse.de
+
+- Improve man page regexp.
+
 -------------------------------------------------------------------
 Tue May 11 12:51:51 UTC 2010 - aj@suse.de
 
diff --git a/rpm-check.sh b/rpm-check.sh
index b9b4293..e0737d7 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -333,12 +333,15 @@ check_single_file()
        done
        ;;
      /usr/share/doc/packages/*/*.html)
-       # texi2html output, e.g. in kvm, indent, qemu
        for f in old/$file new/$file; do
+         # texi2html output, e.g. in kvm, indent, qemu
 	 sed -i -e "s|^<!-- Created on .*, 20.. by texi2html .\...$|<!-- Created on August 7, 2009 by texi2html 1.82|" $f
 	 sed -i -e 's|^ *This document was generated by <em>Autobuild</em> on <em>.*, 20..</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html .\...</em></a>.$|  This document was generated by <em>Autobuild</em> on <em>August 7, 2009</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>.|' $f
+	 # doxygen docu, e.g. in libssh and log4c
+	 sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f
        done
        ;;
+     /usr/share/javadoc/*.html |\
      /usr/share/javadoc/*/*.html|/usr/share/javadoc/*/*/*.html)
        # There are more timestamps in html, so far we handle only some primitive versions.
        for f in old/$file new/$file; do
@@ -349,6 +352,7 @@ check_single_file()
          # Gjdoc HtmlDoclet:
 	 sed -i -e 's%Generated by Gjdoc HtmlDoclet [0-9,.]*, part of <a href="http://www.gnu.org/software/classpath/cp-tools/" title="" target="_top">GNU Classpath Tools</a>, on .*, 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.%Generated by Gjdoc.%' $f
 	 sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\(.*\)GNU Classpath Tools</a>, on [A-Z][a-z]* [0-9]*, 20?? [0-9]*:??:?? \(a|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD XHTML 1.1 plus Target 1.0//EN"\1GNU Classpath Tools</a>, on January 1, 2009 0:00:00 a.m. GMT.</p>%' $f
+	 sed -i -e 's%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\(.*GNU Classpath Tools</a>\), on [a-zA-Z]* [0-9][0-9], 20.. [0-9]*:..:.. \(a\|p\)\.m\. GMT.</p>%<!DOCTYPE html PUBLIC "-//gnu.org///DTD\1,on May 1, 2010 1:11:42 p.m. GMT.</p>%' $f
 	 # deprecated-list is randomly ordered, sort it for comparison
 	 case $f in
 	   */deprecated-list.html)
@@ -358,17 +362,12 @@ check_single_file()
 	 esac
        done
        ;;
+     /usr/share/javadoc/gjdoc.properties |\
      /usr/share/javadoc/*/gjdoc.properties)
        for f in old/$file new/$file; do
 	 sed -i -e 's|^#[A-Z][a-z]\{2\} [A-Z][a-z]\{2\} [0-9]\{2\} ..:..:.. GMT 20..$|#Fri Jan 01 11:27:36 GMT 2009|' $f
        done
        ;;
-     /usr/share/doc/packages/*/html/*.html)
-     # doxygen docu, e.g. in libssh
-       for f in old/$file new/$file; do
-	 sed -i -e 's|Generated on ... ... [0-9]* [0-9]*:[0-9][0-9]:[0-9][0-9] 20[0-9][0-9] for |Generated on Mon May 10 20:45:00 2010 for |' $f
-       done
-       ;;
      */fonts.scale|*/fonts.dir|*/encodings.dir)
        for f in old/$file new/$file; do
          # sort files before comparing
@@ -393,9 +392,10 @@ check_single_file()
 	 # .TH ccmake 1 "March 06, 2010" "ccmake 2.8.1-rc3"
 	 # .TH QEMU-IMG 1 "2010-03-14" " " " "
 	 # .TH kdecmake 1 "May 07, 2010" "cmake 2.8.1"
+	 # .TH "appender.h" 3 "12 May 2010" "Version 1.2.1" "log4c" \" -*- nroff -*-
+	 # .TH "OFFLINEIMAP" "1" "11 May 2010" "John Goerzen" "OfflineIMAP Manual"
        for f in old/$file new/$file; do
-	 sed -i -e 's|^\.TH \(.*\) \([0-9]\) \("20..-..-.."\|20..-..-..\) |.TH \1 \2 "2000-01-01" |' $f
-	 sed -i -e 's|^\.TH \(.*\) \([0-9]\) "[A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]" |.TH \1 \2 "2000-01-01" |' $f
+	 sed -i  -e 's/^.TH "\?\([^ "]*\)"\? "\?\([0-9]\)"\? "\?\(20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\|[A-Z][a-z]* [0-9][0-9], 20[0-9][0-9]\|[0-9]* [A-Z][a-z]* 20[0-9][0-9]\)"\? /.TH \1 \2 "2000-01-01" /' $f
        done
        ;;
      *.elc)
@@ -435,7 +435,7 @@ check_single_file()
      /usr/share/doc/kde/HTML/*/*/index.cache|/usr/share/doc/kde/HTML/*/*/*/index.cache)
        # various kde packages
        for f in old/$file new/$file; do
-	  sed -i -e 's|<a name="id[0-9]*">|<a name="id424242">|g' $f
+	  sed -i -e 's|name="id[0-9]*">|name="id424242">|g' $f
 	  sed -i -e 's|\.html#id[0-9]*">|.html#id424242">|g' $f
        done
        ;;
