diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php
index fd74050ec..b864ff324 100644
--- a/modules/doc/application/controllers/ModuleController.php
+++ b/modules/doc/application/controllers/ModuleController.php
@@ -45,7 +45,8 @@ class Doc_ModuleController extends DocController
         $moduleName = $this->getParam('moduleName');
         $this->assertModuleEnabled($moduleName);
         $moduleManager = Icinga::app()->getModuleManager();
-        $this->renderToc($moduleManager->getModuleDir($moduleName, '/doc'), $moduleName);
+        $this->populateToc($moduleManager->getModuleDir($moduleName, '/doc'), $moduleName);
+        $this->view->moduleName = $moduleName;
     }
 
     /**
diff --git a/modules/doc/application/views/scripts/module/toc.phtml b/modules/doc/application/views/scripts/module/toc.phtml
new file mode 100644
index 000000000..b3be77d79
--- /dev/null
+++ b/modules/doc/application/views/scripts/module/toc.phtml
@@ -0,0 +1,17 @@
+<div class="controls">
+  <h1><?= $docName ?> documentation</h1>
+</div>
+<div class="content" data-base-target="_next">
+  <?php
+    $urlHelper = $this->getHelper('Url');
+    $view = $this;
+  ?>
+  <?= $tocRenderer->render(function ($section) use ($urlHelper, $view, $moduleName) {
+    // Chapter name is not yet defined
+    $path = $urlHelper->url(
+      array('moduleName' => $moduleName, 'chapterName' => 'tbd'), 'doc/module/chapter', false, false
+    );
+    $url = $view->url($path)->setAnchor($section->id);
+    return sprintf('<li><a href="%s">%s</a></li>', $url->getAbsoluteUrl(), $section->title);
+  }); ?>
+</div>