Index: admin/cvs.sh
===================================================================
--- admin/cvs.sh	(revision 3011)
+++ admin/cvs.sh	(working copy)
@@ -32,7 +32,7 @@
 required_autoconf_version="2.53 or newer"
 AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
 case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
   "" )
     echo "*** AUTOCONF NOT FOUND!."
     echo "*** KDE requires autoconf $required_autoconf_version"
@@ -47,7 +47,7 @@
 
 AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
 case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
   "" )
     echo "*** AUTOHEADER NOT FOUND!."
     echo "*** KDE requires autoheader $required_autoconf_version"
Index: kcemirror/cescreen.cpp
===================================================================
--- kcemirror/cescreen.cpp	(revision 3011)
+++ kcemirror/cescreen.cpp	(working copy)
@@ -48,14 +48,16 @@
 #include <X11/keysymdef.h>
 
 
-CeScreen::CeScreen(KAboutApplication *aboutApplication)
+CeScreen::CeScreen()
         : KMainWindow(NULL, "KCeScreen")
 {
     pdaSocket = NULL;
     pause = false;
     setFixedSize(0, 0);
-    this->aboutApplication = aboutApplication;
 
+    aboutApplication = new KAboutApplication(this, "about", false);
+    aboutKDE = new KAboutKDE(this, "aboutkde", false);
+
     imageViewer = new ImageViewer(this);
     setCentralWidget(imageViewer);
 
@@ -72,7 +74,14 @@
                          kapp, SLOT(quit()), 0, 4, 6);
     menuBar()->insertItem(i18n("&File"), filemenu);
 
-    KPopupMenu *helpmenu = customHelpMenu("PDAMirror");
+    KPopupMenu *helpmenu = new KPopupMenu();
+    helpmenu->insertItem(SmallIcon("contents"), i18n("KCeMirror &Handbook"),
+                         this, SLOT(appHelpActivated()));
+    helpmenu->insertSeparator();
+    helpmenu->insertItem(kapp->miniIcon(), i18n("&About KCeMirror"),
+                         this, SLOT(showAboutApplication()));
+    helpmenu->insertItem(SmallIcon("about_kde"), i18n("About &KDE"),
+                         this, SLOT(showAboutKDE()));
     menuBar()->insertItem(i18n("&Help"), helpmenu);
 
     tb = new KToolBar(this, QMainWindow::Top, false, "Utils", true, true);
@@ -111,6 +120,12 @@
 }
 
 
+void CeScreen::showAboutKDE()
+{
+    aboutKDE->show();
+}
+
+
 void CeScreen::resizeWindow()
 {
     adjustSize();
@@ -692,3 +707,4 @@
 }
 
 #include "cescreen.moc"
+
Index: kcemirror/cescreen.h
===================================================================
--- kcemirror/cescreen.h	(revision 3011)
+++ kcemirror/cescreen.h	(working copy)
@@ -29,6 +29,7 @@
 #include <ksock.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
+#include <kaboutkde.h>
 #include <kdebug.h>
 #include "decoder.h"
 
@@ -55,8 +56,9 @@
 class CeScreen : public KMainWindow
 {
     Q_OBJECT
+
 public:
-    CeScreen(KAboutApplication *aboutApplication);
+    CeScreen();
     ~CeScreen();
     bool connectPda(QString pdaName, bool isSynCeDevice = true, bool forceInstall = false);
 
@@ -64,6 +66,7 @@
     virtual void fileSave();
     virtual void filePrint();
     virtual void showAboutApplication();
+    virtual void showAboutKDE();
 
 private slots:
     void readSocket(KSocket *socket);
@@ -101,6 +104,7 @@
     KToolBar *tb;
     KPopupMenu *filemenu;
     KAboutApplication *aboutApplication;
+    KAboutKDE *aboutKDE;
     int pauseItem;
     Decoder *decoderChain;
     unsigned char *bmpData;
@@ -114,5 +118,5 @@
     } keymap[];
 };
 
+#endif
 
-#endif
Index: kcemirror/kcemirror.cpp
===================================================================
--- kcemirror/kcemirror.cpp	(revision 3011)
+++ kcemirror/kcemirror.cpp	(working copy)
@@ -110,7 +110,7 @@
     KApplication a;
 #endif
 
-    CeScreen *ceScreen = new CeScreen(new KAboutApplication(&aboutData));
+    CeScreen *ceScreen = new CeScreen();
 
     QObject::connect(ceScreen, SIGNAL(pdaError()), &a, SLOT(quit()));
 
@@ -125,3 +125,4 @@
 
     return a.exec();
 }
+
Index: config.h.in
===================================================================
--- config.h.in	(revision 3011)
+++ config.h.in	(working copy)
@@ -103,16 +103,16 @@
 /* Define if you don't want QString casted to char * */
 #undef QT_NO_ASCII_CAST
 
-/* The size of a `char', as computed by sizeof. */
+/* The size of `char', as computed by sizeof. */
 #undef SIZEOF_CHAR
 
-/* The size of a `char *', as computed by sizeof. */
+/* The size of `char *', as computed by sizeof. */
 #undef SIZEOF_CHAR_P
 
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
 /* Define to 1 if you have the ANSI C header files. */