diff --git a/docs/01-readme.md b/docs/01-readme.md
index 243444f16..051388ca2 100644
--- a/docs/01-readme.md
+++ b/docs/01-readme.md
@@ -1,4 +1,6 @@
-# awesome
+# Readme
+
+## About awesome
 
 awesome is a highly configurable, next generation framework window manager for X.
 
diff --git a/docs/config.ld.in b/docs/config.ld.in
index 810a3cbb4..5f3069382 100644
--- a/docs/config.ld.in
+++ b/docs/config.ld.in
@@ -13,6 +13,8 @@ pretty='lua'
 style="!pale"
 backtick_references=true
 merge=true
+use_markdown_titles = true
+wrap=true
 topics={
     '00-authors.md',
     '01-readme.md',
@@ -25,6 +27,12 @@ tparam_alias('tag', 'tag')
 -- Should be default, but is not.  Sets up "@tab" => "@tparam table".
 tparam_alias('tab', 'table')
 
+-- More fitting section names
+kind_names={topic='Documentation',module='Libraries'}
+
+-- Sort modules alphabetically
+sort_modules=true
+
 file = {
     -- LUA libraries
     'capi/',