diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8275eb30..e8279dca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = tdevelop std extras kde_app_devel kdevdesigner
+SUBDIRS = tdevelop std extras tde_app_devel kdevdesigner
 
diff --git a/doc/kde_app_devel/CMakeLists.txt b/doc/tde_app_devel/CMakeLists.txt
similarity index 84%
rename from doc/kde_app_devel/CMakeLists.txt
rename to doc/tde_app_devel/CMakeLists.txt
index 243887d5..83e96ce9 100644
--- a/doc/kde_app_devel/CMakeLists.txt
+++ b/doc/tde_app_devel/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kde_app_devel )
+tde_create_handbook( DESTINATION tde_app_devel )
diff --git a/doc/kde_app_devel/Makefile.am b/doc/tde_app_devel/Makefile.am
similarity index 96%
rename from doc/kde_app_devel/Makefile.am
rename to doc/tde_app_devel/Makefile.am
index 41691557..171f575c 100644
--- a/doc/kde_app_devel/Makefile.am
+++ b/doc/tde_app_devel/Makefile.am
@@ -1,3 +1,2 @@
 KDE_LANG = en
 KDE_DOCS = AUTO
-
diff --git a/doc/kde_app_devel/appwizard.png b/doc/tde_app_devel/appwizard.png
similarity index 100%
rename from doc/kde_app_devel/appwizard.png
rename to doc/tde_app_devel/appwizard.png
diff --git a/doc/kde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
similarity index 99%
rename from doc/kde_app_devel/index.docbook
rename to doc/tde_app_devel/index.docbook
index 2d913c0b..60bae16a 100644
--- a/doc/kde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY tdevelop "<application>KDevelop</application>">
+  <!ENTITY tdevelop "<application>TDevelop</application>">
   <!ENTITY kappname "&tdevelop;">
   <!ENTITY % addindex "INCLUDE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
diff --git a/doc/kde_app_devel/kscribblefiles.png b/doc/tde_app_devel/kscribblefiles.png
similarity index 100%
rename from doc/kde_app_devel/kscribblefiles.png
rename to doc/tde_app_devel/kscribblefiles.png
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index 3c9db000..6ca92ef8 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -89,6 +89,17 @@ void SimpleMainWindow::init()
 
     m_mainWindowShare->init();
     setupWindowMenu();
+
+    // Add TDE Programming handbook to Help menu
+    TQMenuBar *mbar = menuBar();
+    TDEPopupMenu *help_menu = dynamic_cast<TDEPopupMenu*>
+                                (menuBar()->findItem(mbar->idAt(mbar->count()-1))->popup());
+    if (help_menu)
+    {
+        help_menu->insertItem(SmallIconSet("contents"), i18n("TDevelop &Programming Handbook"),
+                              TQT_TQOBJECT(this), TQT_SLOT(slotProgrammingHandbook()), NULL, -1, 1);
+    }
+        
     menuBar()->setEnabled( false );
 
     //FIXME: this checks only for global offers which is not quite correct because
@@ -1006,6 +1017,11 @@ void SimpleMainWindow::projectClosed()
     DMainWindow::setCaption(TQString());
 }
 
+void SimpleMainWindow::slotProgrammingHandbook()
+{
+  kapp->invokeHelp(TQString::null, "tde_app_devel");
+}
+
 #include "simplemainwindow.moc"
 
 // kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on
diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h
index 7dbf5695..cc7d86f4 100644
--- a/src/simplemainwindow.h
+++ b/src/simplemainwindow.h
@@ -101,7 +101,8 @@ private slots:
     void raiseRightDock();
     void raiseDock(DDockWindow *dock);
     void lowerAllDocks();
-
+    void slotProgrammingHandbook();
+            
 private:
     void createFramework();
     void createActions();