diff --git a/README b/README
index 1b136a3..9bd56a3 100644
--- a/README
+++ b/README
@@ -70,7 +70,7 @@ Both Qt Assistant (qtcharts.qch) and in HTML format (qtcharts subfolder)
 documentation is generated.
 
 Please refer to the generated documentation for more information:
-    doc/qtcharts/index.html
+    doc/qtcharts/qtcharts-index.html
 
 Known issues
 ============
diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf
index 8345bf6..817a9b8 100644
--- a/src/charts/doc/qtcharts.qdocconf
+++ b/src/charts/doc/qtcharts.qdocconf
@@ -1,8 +1,4 @@
-include($QT_INSTALL_DOCS/global/macros.qdocconf)
-include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
-include($QT_INSTALL_DOCS/global/compat.qdocconf)
-include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
-include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project = QtCharts
 description = Qt Charts Reference Documentation
@@ -15,24 +11,20 @@ headerdirs += .. \
 exampledirs += ../../../examples/charts \
                snippets
 imagedirs += images
-examplesinstallpath = charts
+
+examplesinstallpath = qtcharts/charts
 
 sources.fileextensions  = "*.cpp *.qdoc"
 
-indexes +=  $QT_INSTALL_DOCS/qtcore/qtcore.index \
-            $QT_INSTALL_DOCS/qtgui/qtgui.index \
-            $QT_INSTALL_DOCS/qtqml/qtqml.index \
-            $QT_INSTALL_DOCS/qtquick/qtquick.index \
-            $QT_INSTALL_DOCS/qtmultimedia/qtmultimedia.index
+depends = qtcore qtgui qtwidgets qtqml qtquick qtmultimedia qtdoc
 
-Cpp.ignoretokens        = Q_INVOKABLE \
-                          QT_CHARTS_EXPORT \
+Cpp.ignoretokens       += QT_CHARTS_EXPORT \
                           QT_CHARTS_END_NAMESPACE \
                           QT_CHARTS_BEGIN_NAMESPACE
 
 qhp.projects                  = QtCharts
 qhp.QtCharts.file             = qtcharts.qhp
-qhp.QtCharts.namespace        = com.digia.qtcharts.$QT_VERSION_TAG
+qhp.QtCharts.namespace        = org.qt-project.qtcharts.$QT_VERSION_TAG
 qhp.QtCharts.virtualFolder    = qtcharts
 qhp.QtCharts.indexTitle       = Qt Charts
 qhp.QtCharts.indexRoot        =
@@ -66,7 +58,3 @@ qhp.QtCharts.subprojects.examples.sortPages  = true
 navigation.landingpage = Qt Charts
 navigation.cppclassespage = Qt Charts C++ Classes
 navigation.qmltypespage = Qt Charts QML Types
-
-depends = qtwidgets
-
-buildversion = Qt Charts $QT_VERSION Reference Documentation
diff --git a/src/charts/doc/src/index.qdoc b/src/charts/doc/src/index.qdoc
index f01c67a..d464cd0 100644
--- a/src/charts/doc/src/index.qdoc
+++ b/src/charts/doc/src/index.qdoc
@@ -29,8 +29,7 @@
 
 /*!
     \title Qt Charts
-    \page index.html
-    \keyword About
+    \page qtcharts-index.html
 
     Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View
     Framework, therefore charts can be easily integrated to modern user interfaces. Qt Charts can