diff --git a/docs/Makefile.am b/docs/Makefile.am
index 91879497d..d8b82d704 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -42,5 +42,8 @@ icinga2.8: $(top_builddir)/icinga-app/icinga2
 $(top_builddir)/icinga-app/icinga2:
 	$(MAKE) -C  $(top_builddir)
 
+clean:
+	rm -f $(icinga2doc_DATA)
+
 distclean:
 	rm -f $(icinga2doc_DATA)
diff --git a/docs/icinga2-config-syntax.adoc b/docs/icinga2-config-syntax.adoc
index 3875a3a90..08e27e6ba 100644
--- a/docs/icinga2-config-syntax.adoc
+++ b/docs/icinga2-config-syntax.adoc
@@ -1,5 +1,5 @@
-Icinga 2 Configuration
-======================
+Icinga 2 Configuration Syntax
+=============================
 
 :keywords:	Icinga, documentation, configuration
 :description:	Description of the Icinga 2 config
diff --git a/docs/icinga2-config-types.adoc b/docs/icinga2-config-types.adoc
index f7456385b..2d075ab42 100644
--- a/docs/icinga2-config-types.adoc
+++ b/docs/icinga2-config-types.adoc
@@ -1,5 +1,5 @@
-Icinga 2 Configuration
-======================
+Icinga 2 Configuration Types
+============================
 
 :keywords:	Icinga, documentation, configuration
 :description:	Description of the Icinga 2 config
diff --git a/docs/icinga2-intro.adoc b/docs/icinga2-intro.adoc
index b5834240f..086d53150 100644
--- a/docs/icinga2-intro.adoc
+++ b/docs/icinga2-intro.adoc
@@ -1,5 +1,5 @@
-Icinga 2
-========
+Icinga 2 Introduction
+=====================
 
 Icinga 2 is a network monitoring application that tries to improve upon the
 success of Icinga 1.x while fixing some of its shortcomings. A few frequently
diff --git a/docs/icinga2-main.adoc b/docs/icinga2-main.adoc
index 5c2dd8006..065d975dd 100644
--- a/docs/icinga2-main.adoc
+++ b/docs/icinga2-main.adoc
@@ -1,5 +1,5 @@
-Icinga 2
-========
+Icinga 2 Main
+=============
 
 :keywords:	Icinga, documentation, index
 :description:	Main index of Icinga 2 documentation
diff --git a/docs/icinga2-tutorial.adoc b/docs/icinga2-tutorial.adoc
index 6ba8ca248..b0a19ee1d 100644
--- a/docs/icinga2-tutorial.adoc
+++ b/docs/icinga2-tutorial.adoc
@@ -1,5 +1,5 @@
-Icinga 2 Configuration
-======================
+Icinga 2 Tutorial
+=================
 
 :keywords:	Icinga, documentation, installation, configuration, tutorial
 :description:	Quick introduction to monitoring network services with Icinga 2