diff --git a/doc/conf.py b/doc/conf.py
index 9a2d3889fccaabf81a96792c3cc2aaedca6b4966..02ac674b1911494a2534950e7638c0e87974746d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -18,8 +18,8 @@
 # -- Project information -----------------------------------------------------
 
 project = 'km3io'
-copyright = '2019, Zineb Aly, Tamas Gal, Johannes Schumann'
-author = 'Zineb Aly, Tamas Gal, Johannes Schumann'
+copyright = '2019, Zineb Aly and Tamas Gal'
+author = 'Zineb Aly, Tamas Gal'
 
 
 # -- General configuration ---------------------------------------------------
@@ -43,6 +43,10 @@ templates_path = ['_templates']
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
+# AutoAPI
+autoapi_type = 'python'
+autoapi_dirs = ['../km3io']
+
 
 # -- Options for HTML output -------------------------------------------------
 
diff --git a/doc/index.rst b/doc/index.rst
index b7cea47f2ae38f0e611c59add7476fc561a28b5e..4a6190528ec9f103e0a72bc9b24ffbb53ec6c310 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -10,6 +10,10 @@
    :maxdepth: 2
    :caption: Contents:
 
+   autoapi/index
+   autoapi/km3io/aanet/index
+   autoapi/km3io/jpp/index
+
 
 
 Indices and tables
diff --git a/setup.py b/setup.py
index 87e6250b2c60450ceb1abc654dba6333c4831961..774da594012ca54ee5732a96b387a92535d49f73 100644
--- a/setup.py
+++ b/setup.py
@@ -21,8 +21,8 @@ setup(
     url='http://git.km3net.de/km3py/km3io',
     description='KM3NeT I/O without ROOT',
     long_description=long_description,
-    author='Zineb Aly, Tamas Gal, Johannes Schumann',
-    author_email='zaly@km3net.de, jschumann@km3net.de, tgal@km3net.de',
+    author='Zineb Aly, Tamas Gal',
+    author_email='zaly@km3net.de, tgal@km3net.de',
     packages=['km3io'],
     include_package_data=True,
     platforms='any',
@@ -40,4 +40,4 @@ setup(
     ],
 )
 
-__author__ = 'Zineb Aly, Tamas Gal and Johannes Schumann'
+__author__ = 'Zineb Aly and Tamas Gal'