diff --git a/Makefile.am b/Makefile.am
index 29c67a4..cf2941f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,17 @@
 # Copyright (C) 2013-2015 Yubico AB
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, eithe version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+# General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = gl u2f-host src tests gtk-doc
 
diff --git a/README b/README
index 79a04d6..2f0c5c6 100644
--- a/README
+++ b/README
@@ -11,14 +11,14 @@ device and perform the U2F Register and U2F Authenticate operations.
 License
 -------
 
-The library is licensed under the LGPLv2+ license.  The command-line
-tool and some other files are licensed under the GPLv3+ license.  The
-license for each file should be clear from the comments at the top of
-it.  See the files COPYING (for GPLv3) and COPYING.LGPLv2 for complete
-license texts.  If you have a desire to use this package under another
-license, please contact us to discuss the reason.  For any copyright
-year range specified as YYYY-ZZZZ in this package note that the range
-specifies every single year in that closed interval.
+The library and command-ine tool is licensed under the LGPLv2+ license.
+Some other files are licensed under the GPLv3+ license.  The license for
+each file should be clear from the comments at the top of it.  See the
+files COPYING (for GPLv3) and COPYING.LGPLv2 for complete license texts.
+If you have a desire to use this package under another license, please
+contact us to discuss the reason.  For any copyright year range specified
+as YYYY-ZZZZ in this package note that the range specifies every single
+year in that closed interval.
 
 Usage
 -----
diff --git a/cfg.mk b/cfg.mk
index 2225540..f09206e 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,17 +1,17 @@
 # Copyright (C) 2013-2015 Yubico AB
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, eithe version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+# General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 CFGFLAGS = --enable-gtk-doc --enable-gtk-doc-pdf --enable-gcc-warnings
 
diff --git a/macosx.mk b/macosx.mk
index 5e4d73e..067c044 100644
--- a/macosx.mk
+++ b/macosx.mk
@@ -1,17 +1,17 @@
 # Copyright (C) 2013-2015 Yubico AB
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, eithe version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+# General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 LIBJSONVERSION=0.11
 HIDAPIHASH=0cbc3a409bcb45cefb3edbf144d64ddd4e0821ce
diff --git a/src/Makefile.am b/src/Makefile.am
index 209c0ac..c28e664 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,17 @@
 # Copyright (C) 2013-2015 Yubico AB
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, eithe version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+# General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 AM_CFLAGS = $(WARN_CFLAGS)
 AM_CPPFLAGS=-I$(top_srcdir)/u2f-host -I$(top_builddir) -I$(top_builddir)/u2f-host
diff --git a/src/cmdline.ggo b/src/cmdline.ggo
index 56c8e9c..ee73962 100644
--- a/src/cmdline.ggo
+++ b/src/cmdline.ggo
@@ -1,17 +1,17 @@
 # Copyright (C) 2013-2015 Yubico AB
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, eithe version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+# General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 package "u2f-host"
 purpose "Perform U2F host-side operations on the command line. Reads challenge from standard input and writes a response to standard output."
diff --git a/src/u2f-host.c b/src/u2f-host.c
index ec84b8a..d8abdb4 100644
--- a/src/u2f-host.c
+++ b/src/u2f-host.c
@@ -1,18 +1,18 @@
 /*
   Copyright (C) 2013-2015 Yubico AB
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <config.h>
diff --git a/windows.mk b/windows.mk
index 191631a..45f787a 100644
--- a/windows.mk
+++ b/windows.mk
@@ -1,17 +1,17 @@
 # Copyright (C) 2013-2015 Yubico AB
 #
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, eithe version 3 of the License, or
-# (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1, or (at your option)
+# any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+# General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 LIBJSONVERSION=0.11
 HIDAPIHASH=0cbc3a409bcb45cefb3edbf144d64ddd4e0821ce