From ff508b09e708135a7747ba1f4a774d27a3754e92 Mon Sep 17 00:00:00 2001
From: Thorsten Sommer <service@sommer-engineering.com>
Date: Tue, 23 Jun 2015 20:35:10 +0200
Subject: [PATCH] Updated the license

---
 LICENSE   | 43 ++++++++++++++++++++++++++++++++++++++++++-
 README.md | 12 ++++++++++--
 2 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index 318f98a..c67ee11 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,47 @@
-Copyright (c) 2014, Thorsten Sommer
+===============================================================================
+Copyright
+===============================================================================
+
+Copyright (c) 2015, Thorsten Sommer, http://www.sommer-engineering.com
 All rights reserved.
 
+
+===============================================================================
+Licenses for third-party components
+===============================================================================
+
+Ocean's source code is available under a BSD 2-clause license (see below). The
+used third-party components have different licenses:
+
+Component: UUID
+Link: https://github.com/twinj/uuid
+License: https://github.com/twinj/uuid/blob/master/LICENSE
+
+Component: Source Code Pro
+Link: https://github.com/adobe-fonts/source-code-pro
+License: https://github.com/adobe-fonts/source-code-pro/blob/master/LICENSE.txt
+
+Component: jQuery
+Link: https://github.com/jquery/jquery
+License: https://github.com/jquery/jquery/blob/master/LICENSE.txt
+
+Component: Modernizr
+Link: https://github.com/Modernizr/Modernizr
+License: https://github.com/Modernizr/Modernizr/blob/master/LICENSE
+
+Component: Webflow's front-end library
+Link: https://webflow.com/
+License: https://github.com/SommerEngineering/Ocean/blob/master/Admin/Assets/JSWebflow.go
+
+Component: mgo
+Link: https://github.com/go-mgo/mgo/
+License: https://github.com/go-mgo/mgo/blob/v2-unstable/LICENSE
+
+
+===============================================================================
+Ocean's BSD 2-clause license
+===============================================================================
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: 
 
diff --git a/README.md b/README.md
index fb7c28c..5cd45b3 100644
--- a/README.md
+++ b/README.md
@@ -64,5 +64,13 @@ In case you setting up an additional Ocean server, you are done. After a few min
    * `LogUseDatabaseLogging`: Is the database logging enabled? Yes, you should enable it.
 * As third step, start Ocean again. The system should now run fine. Please have a look at the ICCC startup messages.
 
-## Thanks
-"github.com/twinj/uuid"
+## License
+Ocean's source code is available under a BSD 2-clause license. The used third-party components have different licenses:
+Component | License
+------------ | -------------
+[UUID](https://github.com/twinj/uuid) | [Read](https://github.com/twinj/uuid/blob/master/LICENSE)
+[Source Code Pro](https://github.com/adobe-fonts/source-code-pro) | [Read](https://github.com/adobe-fonts/source-code-pro/blob/master/LICENSE.txt)
+[jQuery](https://github.com/jquery/jquery) | [Read](https://github.com/jquery/jquery/blob/master/LICENSE.txt)
+[Modernizr](https://github.com/Modernizr/Modernizr) | [Read](https://github.com/Modernizr/Modernizr/blob/master/LICENSE)
+[Webflow's front-end library](https://webflow.com/) | [Read](https://github.com/SommerEngineering/Ocean/blob/master/Admin/Assets/JSWebflow.go)
+[mgo](https://github.com/go-mgo/mgo/) | [Read](https://github.com/go-mgo/mgo/blob/v2-unstable/LICENSE)
\ No newline at end of file