diff --git a/docs/conf.py b/docs/conf.py
index e7655d6def49e9eb769087bd9a1ee15ff937fe9a..32ac4f50ab1a3984eb688af553b5dce3da5dde86 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,8 +21,8 @@ sys.path.insert(0, os.path.abspath('..'))
 # -- Project information -----------------------------------------------------
 
 project = 'nomad-FAIR'
-copyright = '2018, the NOMAD developers'
-author = 'the NOMAD developers'
+copyright = '2018, FAIRDI e.V.'
+author = 'FAIRDI e.V.'
 
 # The short X.Y version
 version = ''
diff --git a/gui/src/components/Documentation.js b/gui/src/components/Documentation.js
index 8fdea786959b46d3c1491854d40cb62d9e0e8c12..8f9b2e341baf0dbfc59176bef83128e9e4a831bc 100644
--- a/gui/src/components/Documentation.js
+++ b/gui/src/components/Documentation.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import { withStyles } from '@material-ui/core';
+import { apiBase } from '../config';
 
 
 class Documentation extends Component {
@@ -26,7 +27,7 @@ class Documentation extends Component {
         <div className={classes.content}>
           <iframe
             frameBorder={0} width="768" height={window.innerHeight - 64}
-            src="http://localhost:8000/nomad/api/docs/index.html"
+            src={`${apiBase}/docs/index.html`}
           />
         </div>
       </div>