- allow distribution under GPLv3 as well

58 files changed, 70 insertions, 65 deletions

diff --git a/Readme.txt b/Readme.txt
index 10dd390..f72a0bc 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -61,9 +61,11 @@ http://www.obdev.at/goto.php?t=avrusb-wiki.
 LICENSE
 =======
 AVR-USB and related code is distributed under the terms of the GNU General
-Public License (GPL) version 2 (see License.txt for details). In addition to
-the terms of the GPL, we strongly encourage you to publish your entire
-project and mail OBJECTIVE DEVELOPMENT a link to your publication.
+Public License (GPL) version 2 (see License.txt for details) and the GNU
+General Public License (GPL) version 3. It is your choice whether you apply
+the terms of version 2 or version 3. In addition to the terms of the GPL, we
+strongly encourage you to publish your entire project and mail OBJECTIVE
+DEVELOPMENT a link to your publication.
 
 Alternatively, we offer a commercial license without the restrictions of the
 GPL. See CommercialLicense.txt for details.
diff --git a/examples/custom-class/commandline/set-led.c b/examples/custom-class/commandline/set-led.c
index 75e77e4..3b5be22 100644
--- a/examples/custom-class/commandline/set-led.c
+++ b/examples/custom-class/commandline/set-led.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/custom-class/firmware/Makefile b/examples/custom-class/firmware/Makefile
index 51474ba..8896df5 100644
--- a/examples/custom-class/firmware/Makefile
+++ b/examples/custom-class/firmware/Makefile
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-07
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 DEVICE  = atmega168
diff --git a/examples/custom-class/firmware/main.c b/examples/custom-class/firmware/main.c
index e12ef00..4e59082 100644
--- a/examples/custom-class/firmware/main.c
+++ b/examples/custom-class/firmware/main.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-09
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/custom-class/firmware/requests.h b/examples/custom-class/firmware/requests.h
index 2e7fac3..075c080 100644
--- a/examples/custom-class/firmware/requests.h
+++ b/examples/custom-class/firmware/requests.h
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-09
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/custom-class/make-files.sh b/examples/custom-class/make-files.sh
index f6670fa..6c93372 100755
--- a/examples/custom-class/make-files.sh
+++ b/examples/custom-class/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/drivertest/commandline/runtest.c b/examples/drivertest/commandline/runtest.c
index c15bb42..3eb4c22 100644
--- a/examples/drivertest/commandline/runtest.c
+++ b/examples/drivertest/commandline/runtest.c
@@ -3,7 +3,7 @@
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/drivertest/firmware/Makefile b/examples/drivertest/firmware/Makefile
index a230fd6..a4f9baa 100644
--- a/examples/drivertest/firmware/Makefile
+++ b/examples/drivertest/firmware/Makefile
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-07
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 DEVICE  = atmega8
diff --git a/examples/drivertest/firmware/main.c b/examples/drivertest/firmware/main.c
index b96b1f1..2bcbc8f 100644
--- a/examples/drivertest/firmware/main.c
+++ b/examples/drivertest/firmware/main.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-07
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/drivertest/firmware/requests.h b/examples/drivertest/firmware/requests.h
index 262cfb1..2029c30 100644
--- a/examples/drivertest/firmware/requests.h
+++ b/examples/drivertest/firmware/requests.h
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-09
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/drivertest/firmware/usbconfig.h b/examples/drivertest/firmware/usbconfig.h
index 8a389ab..1198b46 100644
--- a/examples/drivertest/firmware/usbconfig.h
+++ b/examples/drivertest/firmware/usbconfig.h
@@ -4,7 +4,7 @@
  * Creation Date: 2005-04-01
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/drivertest/make-files.sh b/examples/drivertest/make-files.sh
index 3941d33..8f39af8 100755
--- a/examples/drivertest/make-files.sh
+++ b/examples/drivertest/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/hid-custom-rq/firmware/main.c b/examples/hid-custom-rq/firmware/main.c
index e813093..f7a4d0b 100644
--- a/examples/hid-custom-rq/firmware/main.c
+++ b/examples/hid-custom-rq/firmware/main.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-07
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/hid-custom-rq/firmware/requests.h b/examples/hid-custom-rq/firmware/requests.h
index b6a3c2b..3961969 100644
--- a/examples/hid-custom-rq/firmware/requests.h
+++ b/examples/hid-custom-rq/firmware/requests.h
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-09
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/hid-custom-rq/make-files.sh b/examples/hid-custom-rq/make-files.sh
index b52dbf6..8e4feb6 100755
--- a/examples/hid-custom-rq/make-files.sh
+++ b/examples/hid-custom-rq/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/hid-data/commandline/Makefile b/examples/hid-data/commandline/Makefile
index 97c6b06..5a6d860 100644
--- a/examples/hid-data/commandline/Makefile
+++ b/examples/hid-data/commandline/Makefile
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-11
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 # Please read the definitions below and edit them as appropriate for your
diff --git a/examples/hid-data/commandline/Makefile.windows b/examples/hid-data/commandline/Makefile.windows
index f0e6cfa..382a153 100644
--- a/examples/hid-data/commandline/Makefile.windows
+++ b/examples/hid-data/commandline/Makefile.windows
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-11
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 # You may use this file with
diff --git a/examples/hid-data/commandline/hidtool.c b/examples/hid-data/commandline/hidtool.c
index d03bca8..923482a 100644
--- a/examples/hid-data/commandline/hidtool.c
+++ b/examples/hid-data/commandline/hidtool.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-11
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/hid-data/firmware/main.c b/examples/hid-data/firmware/main.c
index e9b2d44..0488414 100644
--- a/examples/hid-data/firmware/main.c
+++ b/examples/hid-data/firmware/main.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-11
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/hid-data/make-files.sh b/examples/hid-data/make-files.sh
index a8d524c..02d8dad 100755
--- a/examples/hid-data/make-files.sh
+++ b/examples/hid-data/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/hid-mouse/firmware/main.c b/examples/hid-mouse/firmware/main.c
index 7667fe7..32a81d4 100644
--- a/examples/hid-mouse/firmware/main.c
+++ b/examples/hid-mouse/firmware/main.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-07
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/examples/hid-mouse/make-files.sh b/examples/hid-mouse/make-files.sh
index 557350b..1b229f4 100755
--- a/examples/hid-mouse/make-files.sh
+++ b/examples/hid-mouse/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/usbtool/Makefile b/examples/usbtool/Makefile
index d809e01..fea2878 100644
--- a/examples/usbtool/Makefile
+++ b/examples/usbtool/Makefile
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-06
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/usbtool/Makefile.windows b/examples/usbtool/Makefile.windows
index 1c4aaa1..fa910fc 100644
--- a/examples/usbtool/Makefile.windows
+++ b/examples/usbtool/Makefile.windows
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-06
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 # You may use this file with
diff --git a/examples/usbtool/make-files.sh b/examples/usbtool/make-files.sh
index 0ba183e..c45f5b2 100755
--- a/examples/usbtool/make-files.sh
+++ b/examples/usbtool/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/examples/usbtool/usbtool.c b/examples/usbtool/usbtool.c
index fe29a06..173f491 100644
--- a/examples/usbtool/usbtool.c
+++ b/examples/usbtool/usbtool.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-06
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-device/osccal.c b/libs-device/osccal.c
index 01f9002..f7c5dd6 100644
--- a/libs-device/osccal.c
+++ b/libs-device/osccal.c
@@ -3,7 +3,7 @@
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-device/osccal.h b/libs-device/osccal.h
index e2fdb07..f51580b 100644
--- a/libs-device/osccal.h
+++ b/libs-device/osccal.h
@@ -3,7 +3,7 @@
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-device/osctune.h b/libs-device/osctune.h
index e359c38..dd97da8 100644
--- a/libs-device/osctune.h
+++ b/libs-device/osctune.h
@@ -3,7 +3,7 @@
  * Creation Date: 2008-10-18
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-host/hiddata.c b/libs-host/hiddata.c
index 54b8dbb..c2c3322 100644
--- a/libs-host/hiddata.c
+++ b/libs-host/hiddata.c
@@ -3,7 +3,7 @@
  * Creation Date: 2008-04-11
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-host/hiddata.h b/libs-host/hiddata.h
index e362730..86b0c4f 100644
--- a/libs-host/hiddata.h
+++ b/libs-host/hiddata.h
@@ -3,7 +3,7 @@
  * Creation Date: 2008-04-11
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-host/hidsdi.h b/libs-host/hidsdi.h
index 840afcb..f98f291 100644
--- a/libs-host/hidsdi.h
+++ b/libs-host/hidsdi.h
@@ -3,7 +3,7 @@
  * Creation Date: 2006-02-02
  * Tabsize: 4
  * Copyright: (c) 2006-2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-host/opendevice.c b/libs-host/opendevice.c
index cd41c15..0cfdbe2 100644
--- a/libs-host/opendevice.c
+++ b/libs-host/opendevice.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/libs-host/opendevice.h b/libs-host/opendevice.h
index 046392e..2311f54 100644
--- a/libs-host/opendevice.h
+++ b/libs-host/opendevice.h
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-10
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
@@ -17,7 +17,7 @@ obtain textual descriptions from a device.
 
 To use this functionality, simply copy opendevice.c and opendevice.h into your
 project and add them to your Makefile. You may modify and redistribute these
-files according to the GNU General Public License (GPL) version 2.
+files according to the GNU General Public License (GPL) version 2 or 3.
 */
 
 #ifndef __OPENDEVICE_H_INCLUDED__
diff --git a/make-files.sh b/make-files.sh
index d043d55..4c75af1 100755
--- a/make-files.sh
+++ b/make-files.sh
@@ -3,7 +3,7 @@
 # Creation Date: 2008-04-17
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 
diff --git a/mkdist.sh b/mkdist.sh
index 4110a25..92dc09d 100755
--- a/mkdist.sh
+++ b/mkdist.sh
@@ -5,7 +5,7 @@
 # Creation Date: 2008-04-18
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 # This script was created for Mac OS X with EAGLE and ImageMagick installed
diff --git a/tests/Makefile b/tests/Makefile
index ff0b8fa..96f473e 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,7 +4,7 @@
 # Creation Date: 2008-04-07
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 DEVICE  = attiny2313
diff --git a/tests/compare-sizes.awk b/tests/compare-sizes.awk
index d294c54..659599e 100755
--- a/tests/compare-sizes.awk
+++ b/tests/compare-sizes.awk
@@ -5,7 +5,7 @@
 # Creation Date: 2008-04-29
 # Tabsize: 4
 # Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
-# License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+# License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
 # This Revision: $Id$
 
 BEGIN{
diff --git a/tests/main.c b/tests/main.c
index 44e32d6..9a6216c 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-29
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/tests/null.c b/tests/null.c
index 550e636..d19a1b8 100644
--- a/tests/null.c
+++ b/tests/null.c
@@ -4,7 +4,7 @@
  * Creation Date: 2008-04-29
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/tests/usbconfig.h b/tests/usbconfig.h
index 8955d14..f97cf63 100644
--- a/tests/usbconfig.h
+++ b/tests/usbconfig.h
@@ -4,7 +4,7 @@
  * Creation Date: 2005-04-01
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/License.txt b/usbdrv/License.txt
index f6a232e..e9b2752 100644
--- a/usbdrv/License.txt
+++ b/usbdrv/License.txt
@@ -1,6 +1,8 @@
 OBJECTIVE DEVELOPMENT GmbH's AVR-USB driver software is distributed under the
-terms and conditions of the GNU GPL version 2, see the text below. In addition
-to the requirements in the GPL, we STRONGLY ENCOURAGE you to do the following:
+terms and conditions of the GNU GPL version 2 or the GNU GPL version 3. It is
+your choice whether you apply the terms of version 2 or version 3. The full
+text of GPLv2 is included below. In addition to the requirements in the GPL,
+we STRONGLY ENCOURAGE you to do the following:
 
 (1) Publish your entire project on a web site and drop us a note with the URL.
 Use the form at http://www.obdev.at/avrusb/feedback.html for your submission.
diff --git a/usbdrv/Readme.txt b/usbdrv/Readme.txt
index f846689..7828f64 100644
--- a/usbdrv/Readme.txt
+++ b/usbdrv/Readme.txt
@@ -115,10 +115,11 @@ usbdrv.c because this module has been deliberately optimized for gcc.
 USING AVR-USB FOR FREE
 ======================
 The AVR firmware driver is published under the GNU General Public License
-Version 2 (GPL2). See the file "License.txt" for details.
+Version 2 (GPL2) and the GNU General Public License Version 3 (GPL3). It is
+your choice whether you apply the terms of version 2 or version 3.
 
-If you decide for the free GPL2, we STRONGLY ENCOURAGE you to do the following
-things IN ADDITION to the obligations from the GPL2:
+If you decide for the free GPL2 or GPL3, we STRONGLY ENCOURAGE you to do the
+following things IN ADDITION to the obligations from the GPL:
 
 (1) Publish your entire project on a web site and drop us a note with the URL.
 Use the form at http://www.obdev.at/avrusb/feedback.html for your submission.
@@ -139,7 +140,7 @@ to your modifications for our commercial license offerings.
 
 COMMERCIAL LICENSES FOR AVR-USB
 ===============================
-If you don't want to publish your source code under the terms of the GPL2,
+If you don't want to publish your source code under the terms of the GPL,
 you can simply pay money for AVR-USB. As an additional benefit you get
 USB PIDs for free, licensed exclusively to you. See the file
 "CommercialLicense.txt" for details.
diff --git a/usbdrv/asmcommon.inc b/usbdrv/asmcommon.inc
index b9b985d..1af53b8 100644
--- a/usbdrv/asmcommon.inc
+++ b/usbdrv/asmcommon.inc
@@ -4,7 +4,7 @@
  * Creation Date: 2007-11-05
  * Tabsize: 4
  * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * Revision: $Id$
  */
 
diff --git a/usbdrv/oddebug.c b/usbdrv/oddebug.c
index 612e036..466e68f 100644
--- a/usbdrv/oddebug.c
+++ b/usbdrv/oddebug.c
@@ -4,7 +4,7 @@
  * Creation Date: 2005-01-16
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/oddebug.h b/usbdrv/oddebug.h
index 80d9760..c56af1c 100644
--- a/usbdrv/oddebug.h
+++ b/usbdrv/oddebug.h
@@ -4,7 +4,7 @@
  * Creation Date: 2005-01-16
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbconfig-prototype.h b/usbdrv/usbconfig-prototype.h
index 79fe346..d125739 100644
--- a/usbdrv/usbconfig-prototype.h
+++ b/usbdrv/usbconfig-prototype.h
@@ -4,7 +4,7 @@
  * Creation Date: 2005-04-01
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrv.c b/usbdrv/usbdrv.c
index 2df6ad7..d774a5f 100644
--- a/usbdrv/usbdrv.c
+++ b/usbdrv/usbdrv.c
@@ -4,7 +4,7 @@
  * Creation Date: 2004-12-29
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrv.h b/usbdrv/usbdrv.h
index fe3a3f7..a10a7ee 100644
--- a/usbdrv/usbdrv.h
+++ b/usbdrv/usbdrv.h
@@ -4,7 +4,7 @@
  * Creation Date: 2004-12-29
  * Tabsize: 4
  * Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm.S b/usbdrv/usbdrvasm.S
index f7d22e9..47a1850 100644
--- a/usbdrv/usbdrvasm.S
+++ b/usbdrv/usbdrvasm.S
@@ -4,7 +4,7 @@
  * Creation Date: 2007-06-13
  * Tabsize: 4
  * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm.asm b/usbdrv/usbdrvasm.asm
index 4a5486f..a534b73 100644
--- a/usbdrv/usbdrvasm.asm
+++ b/usbdrv/usbdrvasm.asm
@@ -4,7 +4,7 @@
  * Creation Date: 2006-03-01
  * Tabsize: 4
  * Copyright: (c) 2006 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm12.inc b/usbdrv/usbdrvasm12.inc
index 3d815e7..2b38157 100644
--- a/usbdrv/usbdrvasm12.inc
+++ b/usbdrv/usbdrvasm12.inc
@@ -4,7 +4,7 @@
  * Creation Date: 2004-12-29
  * Tabsize: 4
  * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm128.inc b/usbdrv/usbdrvasm128.inc
index 619ff98..23b1f99 100644
--- a/usbdrv/usbdrvasm128.inc
+++ b/usbdrv/usbdrvasm128.inc
@@ -4,7 +4,7 @@
  * Creation Date: 2008-10-11
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm15.inc b/usbdrv/usbdrvasm15.inc
index 1232018..1e9ddcb 100644
--- a/usbdrv/usbdrvasm15.inc
+++ b/usbdrv/usbdrvasm15.inc
@@ -4,7 +4,7 @@
  * Creation Date: 2007-08-06
  * Tabsize: 4
  * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm16.inc b/usbdrv/usbdrvasm16.inc
index 36fae4a..e4a0226 100644
--- a/usbdrv/usbdrvasm16.inc
+++ b/usbdrv/usbdrvasm16.inc
@@ -4,7 +4,7 @@
  * Creation Date: 2007-06-15
  * Tabsize: 4
  * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm165.inc b/usbdrv/usbdrvasm165.inc
index 2ebf321..fdf3a2a 100644
--- a/usbdrv/usbdrvasm165.inc
+++ b/usbdrv/usbdrvasm165.inc
@@ -4,7 +4,7 @@
  * Creation Date: 2007-04-22
  * Tabsize: 4
  * Copyright: (c) 2007 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * Revision: $Id$
  */
 
diff --git a/usbdrv/usbdrvasm20.inc b/usbdrv/usbdrvasm20.inc
index fe618f6..8f07d3c 100644
--- a/usbdrv/usbdrvasm20.inc
+++ b/usbdrv/usbdrvasm20.inc
@@ -5,7 +5,7 @@
  * Creation Date: 2008-03-05
  * Tabsize: 4
  * Copyright: (c) 2008 by Jeroen Benschop and OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * Revision: $Id$
  */
 
diff --git a/usbdrv/usbportability.h b/usbdrv/usbportability.h
index 43d9a48..3a28ccb 100644
--- a/usbdrv/usbportability.h
+++ b/usbdrv/usbportability.h
@@ -4,7 +4,7 @@
  * Creation Date: 2008-06-17
  * Tabsize: 4
  * Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
- * License: GNU GPL v2 (see License.txt) or proprietary (CommercialLicense.txt)
+ * License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
  * This Revision: $Id$
  */