diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index 40d24c604845bcaced35c005b89b10c574ca33cf..dbfe51ae257aa8a2827fd45751e58f54b72d06a8 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -2,7 +2,7 @@ project     = "Qt Creator"
 description = "Qt Creator Manual"
 
 headerdirs = 
-sourcedirs = $SRCDIR
+sourcedirs = $SRCDIR/src $SRCDIR/src
 imagedirs = $SRCDIR/images $SRCDIR/templates/images
 outputdir = $OUTDIR
 exampledirs = $SRCDIR
@@ -13,13 +13,7 @@ include(macros.qdocconf)
 include(qt-cpp-ignore.qdocconf)
 include(qt-defines.qdocconf)
 
-sources.fileextensions  =   "qtcreator.qdoc \
-                            maemodev.qdoc \
-                            symbiandev.qdoc \
-                            addressbook-sdk.qdoc \
-                            qtcreator-faq.qdoc \
-                            linuxdev.qdoc \
-                            meegodev.qdoc"
+sources.fileextensions         = "*.qdoc"
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
diff --git a/doc/doc.pri b/doc/doc.pri
index cb788611914a11d689ff17ba2439b55c005b2304..b5ec6402efc1f0d24cd6546e11fa7e6a87f161b3 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -22,7 +22,8 @@ defineReplace(qdoc) {
 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
 QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch
 
-HELP_DEP_FILES = $$PWD/qtcreator.qdoc \
+HELP_DEP_FILES = $$PWD/src/qtcreator.qdoc \
+                 $$PWD/src \
                  $$PWD/addressbook-sdk.qdoc \
                  $$PWD/config/compat.qdocconf \
                  $$PWD/config/macros.qdocconf \