diff -u -r -U5 --no-dereference khal-0.6.0/doc/source/conf.py khal-0.6.0.man/doc/source/conf.py
--- khal-0.6.0/doc/source/conf.py	2015-07-14 19:04:35.000000000 -0400
+++ khal-0.6.0.man/doc/source/conf.py	2015-08-08 00:33:54.412864487 -0400
@@ -29,11 +29,11 @@
 # ones.
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.todo',
-    'sphinxcontrib.newsfeed',
+#    'sphinxcontrib.newsfeed',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['ytemplates']
 
@@ -102,20 +102,20 @@
 
 # -- Options for HTML output ----------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'alabaster'
+html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {
-    'github_user': 'geier',
-    'github_repo': 'khal',
-    'travis_button': 'true',
-}
+#html_theme_options = {
+#    'github_user': 'geier',
+#    'github_repo': 'khal',
+#    'travis_button': 'true',
+#}
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []
 
 # The name for this set of Sphinx documents.  If None, it defaults to
@@ -151,19 +151,20 @@
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    '**': [
-        'about.html',
-        'navigation.html',
-        'relations.html',
-        'searchbox.html',
-        'donate.html',
-    ]
-}
+html_sidebars = {}
+#html_sidebars = {
+#    '**': [
+#        'about.html',
+#        'navigation.html',
+#        'relations.html',
+#        'searchbox.html',
+#        'donate.html',
+#    ]
+#}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
 #html_additional_pages = {}
 
diff -u -r -U5 --no-dereference khal-0.6.0/doc/source/Makefile khal-0.6.0.man/doc/source/Makefile
--- khal-0.6.0/doc/source/Makefile	2015-07-14 19:04:35.000000000 -0400
+++ khal-0.6.0.man/doc/source/Makefile	2015-08-08 00:33:08.757601812 -0400
@@ -1,4 +1,4 @@
-configspec.rst: ../../../khal/khal/settings/khal.spec generate_config.py
+configspec.rst: ../../../khal-0.7.0/khal/settings/khal.spec generate_config.py
 	python generate_config.py > configspec.rst
 
 .PHONY: configspec.rst