diff --git a/parser/parser-octopus/aseoct.py b/parser/parser-octopus/aseoct.py
index 6c47b1687845065a66b6da184011117a534210ca..2893c1eb4366dee5ed9c474cab5d0743d4a983d3 100644
--- a/parser/parser-octopus/aseoct.py
+++ b/parser/parser-octopus/aseoct.py
@@ -1,19 +1,25 @@
-# coding=utf-8
-"""This is based on a fork of the ASE-interface to Octopus.
-
-The Octopus ASE interface is written by
+# Copyright 2016-2018 The NOMAD Developers Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# coding = utf-8
+
+"""This module is written by
 
   Ask Hjorth Larsen <asklarsen@gmail.com>
   Carlos de Armas
-
-and made available for NOMAD to license
-as appropriate.
-
-It has *also* been contributed to ASE itself.
-The copy within ASE is under LGPL v2.1+.
-
-http://tddft.org/programs/octopus/
 """
+
 import os
 import re
 from subprocess import Popen, PIPE
diff --git a/parser/parser-octopus/generate-octopus-json.py b/parser/parser-octopus/generate-octopus-json.py
index b7ebc27cd0d7fb8c7ccfb16a10cb3fea0121553f..99e5f1862e82267085eb3959c7f986655c57147d 100644
--- a/parser/parser-octopus/generate-octopus-json.py
+++ b/parser/parser-octopus/generate-octopus-json.py
@@ -1,3 +1,18 @@
+# Copyright 2016-2018 The NOMAD Developers Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 from __future__ import print_function
 from subprocess import Popen, PIPE
 
diff --git a/parser/parser-octopus/parser_octopus.py b/parser/parser-octopus/parser_octopus.py
index 8b3b63c7ce9f11f6ee2442cb34e20a01838dd639..081a0d806a810a5d26385281c25bccb613ba2840 100644
--- a/parser/parser-octopus/parser_octopus.py
+++ b/parser/parser-octopus/parser_octopus.py
@@ -1,3 +1,18 @@
+# Copyright 2016-2018 The NOMAD Developers Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 from __future__ import print_function
 import re
 import os
diff --git a/parser/parser-octopus/setup_paths.py b/parser/parser-octopus/setup_paths.py
index e0a0fb009256a0d4056e81c12e82d15bfd3ea7c4..52cfcf1632c971e80b6f7e91480a8b6c2f1f2ac5 100644
--- a/parser/parser-octopus/setup_paths.py
+++ b/parser/parser-octopus/setup_paths.py
@@ -1,3 +1,17 @@
+# Copyright 2016-2018 The NOMAD Developers Group
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import sys, os, os.path
 baseDir = os.path.dirname(os.path.abspath(__file__))
 commonDir = os.path.normpath(os.path.join(baseDir,"../../../../python-common/common/python"))