Update LICENSE and ChangeLog

2 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 8c472127b..7e660177d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
 ==== WebUI ====
   * Fix #870 use proper config location for loading ssl cert
 
+==== Misc ====
+  * Add OpenSSL exception to license
+
 === Deluge 1.1.5 - (16 March 2009) ===
 ==== Core ====
   * Fix config file saving when no current config file exists
diff --git a/LICENSE b/LICENSE
index 94a045322..89f652a8a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,17 @@
+Deluge is licensed under the GNU General Public License version 3 with the
+addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the OpenSSL
+library.
+You must obey the GNU General Public License in all respects for all of
+the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007