diff --git a/LICENSE.txt b/LICENSE.txt
index 2def0e8831c25daae02b8b87cd439da27f1ac1c1..b04eb24b311ab0b60290742b76256132186a0d4a 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -658,4 +658,53 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or combining it with any of the below libraries (or a modified version of that library), containing parts covered by the terms of any of the below libraries, the licensors of this Program grant you additional permission to convey the resulting work. 
+
+cider/cider-nrepl
+clojure-complete
+clojurewerkz/quartzite
+clojurewerkz/support
+clout
+colorize
+com.cemerick/friend 
+compojure 
+environ 
+hiccup 
+junit
+korma
+medley
+org.clojure/clojure
+org.clojure/clojurescript
+org.clojure/core.async
+org.clojure/core.cache
+org.clojure/core.incubator
+org.clojure/core.logic
+org.clojure/core.match
+org.clojure/core.memoize
+org.clojure/data.csv
+org.clojure/data.json
+org.clojure/data.priority-map
+org.clojure/java.classpath
+org.clojure/java.jdbc
+org.clojure/math.numeric-tower
+org.clojure/tools.analyzer
+org.clojure/tools.analyzer.jvm
+org.clojure/tools.logging 
+org.clojure/tools.macro 
+org.clojure/tools.namespace 
+org.clojure/tools.nrepl
+org.clojure/tools.reader 
+org.tcrawley/dynapath 
+quoin 
+refactor-nrepl 
+robert/hooke 
+scout 
+slingshot 
+stencil 
+swiss-arrows 
+tigris 
+instaparse
diff --git a/README.md b/README.md
index 49953029dd8c0fe4b8f116e47ed9e11ffdcc050a..f026bafc03d2d6e973ecfe868c993271b50a3786 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,6 @@ Metabase also allows you to hit our Query API directly from Javascript to integr
 
 Unless otherwise noted, all Metabase source files are made available under the terms of the GNU Affero General Public License (AGPL).
 
-See [LICENSE.txt](https://github.com/metabase/metabase/blob/master/LICENSE.txt) for details.
+See [LICENSE.txt](https://github.com/metabase/metabase/blob/master/LICENSE.txt) for details and exceptions.
 
 Unless otherwise noted, all files © 2015 Metabase, Inc.