diff --git a/TODO b/TODO
index ac0d2b13c..c834de720 100644
--- a/TODO
+++ b/TODO
@@ -5,9 +5,8 @@ URGENT
 
 o implement SaveAs
 
-o PS-Gfx is not updated upon reloading
-
-o kviewshell should change pageno when clicking on internal hyperlinks
+o kviewshell should change pageno when clicking on internal
+  hyperlinks, same on reloading
 
 
 HIGHLY DESIRABLE
@@ -24,7 +23,6 @@ o Support for click-on-dvi => editor (klyx!) jumps to proper position. This is
 o Support papersize information given by the dvi-file on a page-by-page
   basis.
 
-o HelpMenu and AboutDialog - beautification
 
 NOT SO URGENT
 
diff --git a/dviwin.cpp b/dviwin.cpp
index 88843f0f1..21e866f31 100644
--- a/dviwin.cpp
+++ b/dviwin.cpp
@@ -255,7 +255,7 @@ void dviWindow::setResolution( int bdpi )
 void dviWindow::drawPage()
 {
 #ifdef DEBUG
-  kdDebug() << "drawPage" << endl;
+  kdDebug(4300) << "drawPage" << endl;
 #endif
 
   if (dviFile == NULL) {
diff --git a/kdvi_multipage.cpp b/kdvi_multipage.cpp
index 1db253fac..108e959f6 100644
--- a/kdvi_multipage.cpp
+++ b/kdvi_multipage.cpp
@@ -1,3 +1,5 @@
+//i18n and Debug ok.
+
 #include <qobject.h>
 #include <qlabel.h>
 #include <qstring.h>
@@ -6,14 +8,16 @@
 #include <qpixmap.h>
 
 
-#include <kinstance.h>
+#include <kaboutdata.h>
+#include <kaboutdialog.h>
+#include <kapp.h>
+#include <kbugreport.h>
+#include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kapp.h>
-#include <kaboutdialog.h>
-#include <kimageeffect.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <kimageeffect.h>
+#include <kinstance.h>
 
 
 #include "print.h"
@@ -76,14 +80,18 @@ KDVIMultiPage::KDVIMultiPage(QWidget *parentWidget, const char *widgetName, QObj
 	      SLOT(doSettings()), actionCollection(),
 	      "settings_dvi");
 
-  new KAction(i18n("About KDVI..."), 0, this,
+  new KAction(i18n("About the KDVI plugin..."), 0, this,
 	      SLOT(about()), actionCollection(),
 	      "about_kdvi");
   
-  new KAction(i18n("Help on KDVI"), 0, this,
+  new KAction(i18n("Help on the KDVI plugin..."), 0, this,
 	      SLOT(helpme()), actionCollection(),
 	      "help_dvi");
 
+  new KAction(i18n("Report Bug in the KDVI plugin..."), 0, this,
+	      SLOT(bugform()), actionCollection(),
+	      "bug_dvi");
+
   setXMLFile("kdvi_part.rc");
 
   scrollView()->addChild(window);
@@ -214,14 +222,49 @@ void KDVIMultiPage::doSettings()
 
 void KDVIMultiPage::about()
 {
-  KAboutDialog *ab = new KAboutDialog();
-  ab->setMaintainer("Stefan Kebekus","stefan.kebekus@uni-bayreuth.de", 
-		    "http://btm8x5.mat.uni-bayreuth.de/~kebekus", "University of Bayreuth");
-  ab->setAuthor("Markku Hihnala","mah@ee.oulu.fi", QString::null, QString::null);
-  ab->setVersion("KDVI 0.9 beta");
+  KAboutDialog *ab = new KAboutDialog(KAboutDialog::AbtAppStandard, 
+				      i18n("the KDVI plugin"), 
+				      KAboutDialog::Close, KAboutDialog::Close);
+
+  ab->setProduct("kdvi", "0.9beta", QString::null, QString::null);
+  ab->addTextPage (i18n("About"), 
+		   i18n("A previewer for Device Independent files (DVI files) produced "
+			"by the TeX typesetting system.<br>"
+			"Based on kdvi 0.4.3 and on xdvik, version 18f.<br><hr>"
+			"For latest information, visit "
+			"<a href=\"http://devel-home.kde.org/~kdvi\">KDVI's Homepage</a>."),
+		   true);
+  ab->addTextPage (i18n("Authors"), 
+		   i18n("Markku Hinhala<br>"
+			"Author of kdvi 0.4.3"
+			"<hr>"
+			"Stefan Kebekus<br>"
+			"<a href=\"http://btm8x5.mat.uni-bayreuth.de/~kebekus\">"
+			"http://btm8x5.mat.uni-bayreuth.de/~kebekus</a><br>"
+			"<a href=\"mailto:kebekus@kde.org\">kebekus@kde.org</a><br>"
+			"Current maintainer of kdvi. Major rewrite of version 0.4.3."
+			"Implementation of hyperlinks.<br>"
+			"<hr>"
+			"Nicolai Langfeldt<br>"
+			" Maintainer of xdvik"
+			"<hr>"
+			"Paul Vojta<br>"
+			" Author of xdvi<br>"
+			"<hr>"
+			"Many others. Really, lots of people who were involved in kdvi, xdvik and "
+			"xdvi. I apologize to those who I did not mention here. Please send me an "
+			"email if you think your name belongs here."),
+		   true);
   ab->show();
 }
 
+void KDVIMultiPage::bugform()
+{
+  KAboutData *kab = new KAboutData("kdvi", i18n("KDVI"), "0.9 beta", 0, 0, 0, 0, 0);
+  KBugReport *kbr = new KBugReport(0, true, kab );
+  kbr->show();
+}
+
 void KDVIMultiPage::helpme()
 {
   kapp->invokeHelp( "", "kdvi" );
@@ -230,7 +273,7 @@ void KDVIMultiPage::helpme()
 void KDVIMultiPage::preferencesChanged()
 {
 #ifdef DEBUG
-  kdDebug() << "preferencesChanged" << endl;
+  kdDebug(4300) << "preferencesChanged" << endl;
 #endif
 
   KConfig *config = instance()->config();
@@ -310,13 +353,17 @@ bool KDVIMultiPage::print(const QStrList &pages, int current)
 
 void KDVIMultiPage::timerEvent( QTimerEvent *e )
 {
-  kdDebug() << "Timer Event " << endl;
+#ifdef DEBUG
+  kdDebug(4300) << "Timer Event " << endl;
+#endif
   reload();
 }
 
 void KDVIMultiPage::reload()
 {
-  kdDebug() << "Reload file " << m_file << endl;
+#ifdef DEBUG
+  kdDebug(4300) << "Reload file " << m_file << endl;
+#endif
 
   if (window->correctDVI(m_file)) {
     killTimer(timer_id);
diff --git a/kdvi_multipage.h b/kdvi_multipage.h
index bae5e5acf..9e59b7c3e 100644
--- a/kdvi_multipage.h
+++ b/kdvi_multipage.h
@@ -107,6 +107,7 @@ protected slots:
   void doSettings();
   void about();
   void helpme();
+  void bugform();
   void preferencesChanged();
   void goto_page(int page, int y);
 
diff --git a/kdvi_part.rc b/kdvi_part.rc
index 60388dce9..60d48bb31 100644
--- a/kdvi_part.rc
+++ b/kdvi_part.rc
@@ -11,5 +11,8 @@
  <Menu name="help"><text>Help</text>
   <Action name="about_kdvi" append="options_show_merge"/>
  </Menu>
+ <Menu name="help"><text>Help</text>
+  <Action name="bug_dvi" append="options_show_merge"/>
+ </Menu>
 </MenuBar>
 </kpartgui>