diff --git a/LICENSE.md b/LICENSE.md
index b2ba7010bf3..1d66924e955 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright 2012-2013 Elasticsearch BV
+Copyright 2012-2013 Elasticsearch BV, Torkel Ödegaard
 
 Licensed under the Apache License, Version 2.0 (the "License"); you
 may not use this file except in compliance with the License. You may
@@ -11,3 +11,4 @@ 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.
+
diff --git a/NOTICE.md b/NOTICE.md
new file mode 100644
index 00000000000..171332f00d4
--- /dev/null
+++ b/NOTICE.md
@@ -0,0 +1,16 @@
+
+This software is based on Kibana:
+========================================
+Copyright 2012-2013 Elasticsearch BV
+
+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.