diff --git a/docs/conf.py b/docs/conf.py
index fa008344..cf6bb70d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,13 +42,20 @@
 from astropy_helpers.sphinx.conf import *
 
 # Get configuration information from setup.cfg
-from distutils import config
-conf = config.ConfigParser()
+try:
+    from ConfigParser import ConfigParser
+except ImportError:
+    from configparser import ConfigParser
+conf = ConfigParser()
+
 conf.read([os.path.join(os.path.dirname(__file__), '..', 'setup.cfg')])
 setup_cfg = dict(conf.items('metadata'))
 
 # -- General configuration ----------------------------------------------------
 
+# By default, highlight as Python 3.
+highlight_language = 'python3'
+
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.2'
 
@@ -56,9 +63,6 @@
 # major.minor, call `check_sphinx_version("x.y.z")` here.
 # check_sphinx_version("1.2.1")
 
-# Remove buggy astropy extension
-extensions.remove('astropy_helpers.sphinx.ext.astropyautosummary')
-
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns.append('_templates')
@@ -72,7 +76,6 @@
 
 # This does not *have* to match the package name, but typically does
 project = setup_cfg['package_name']
-author = setup_cfg['author']
 author = u'Association of Universities for Research in Astronomy'
 copyright = '{0}, {1}'.format(
     datetime.datetime.now().year, author)
@@ -170,3 +173,6 @@
 
     edit_on_github_source_root = ""
     edit_on_github_doc_root = "docs"
+
+# -- Resolving issue number to links in changelog -----------------------------
+github_issues_url = 'https://github.com/{0}/issues/'.format(setup_cfg['github_project'])
diff --git a/docs/fitsheaders.rst b/docs/fitsheaders.rst
index 5b8215cf..00b85e96 100644
--- a/docs/fitsheaders.rst
+++ b/docs/fitsheaders.rst
@@ -1,7 +1,7 @@
 .. _fitsheaders:
 
 POPPY FITS Header Keywords Definitions
-=============
+======================================
 
 
 * `WAVELEN`: Wavelength in meters