diff --git a/ChangeLog b/ChangeLog
index 11801cbcb..917e08b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-18  Werner Lemberg <wl@gnu.org>
+
+	Update license documentation.
+
+	* docs/GPL.TXT: Renamed to...
+	* docs/GPLv2.TXT: This.
+
+	* docs/LICENSE.TXT: Updated.
+
 2011-06-14  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
 
 	Fix g++4.6 compiler warnings in module drivers.
diff --git a/docs/GPL.TXT b/docs/GPLv2.TXT
similarity index 100%
rename from docs/GPL.TXT
rename to docs/GPLv2.TXT
diff --git a/docs/LICENSE.TXT b/docs/LICENSE.TXT
index abebbcc78..62945c85f 100644
--- a/docs/LICENSE.TXT
+++ b/docs/LICENSE.TXT
@@ -15,9 +15,12 @@ any of your projects or products.
     is  suited  to products  which  don't  use  the GNU  General  Public
     License.
 
-  - The GNU  General Public License  version 2, found in  `GPL.TXT' (any
+    Note that  this license  is  compatible  to the  GNU General  Public
+    License version 3, but not version 2.
+
+  - The GNU General Public License version 2, found in  `GPLv2.TXT' (any
     later version can be used  also), for programs which already use the
-    GPL.  Note  that the  FTL is  incompatible with the  GPL due  to its
+    GPL.  Note  that the  FTL is  incompatible  with  GPLv2 due  to  its
     advertisement clause.
 
 The contributed BDF and PCF drivers come with a license similar  to that