File 0001-Correct-inconsistent-licensing-text.patch of Package libmusicbrainz4

From 3a4ac500c1c21ac7012b947a017ecdab091d07f1 Mon Sep 17 00:00:00 2001
From: Andy Hawkins <andy@gently.org.uk>
Date: Mon, 3 Sep 2012 21:28:15 +0100
Subject: [PATCH] Correct inconsistent licensing text

---
 examples/cdlookup.cc                      |  5 +++--
 examples/cdlookup_c.c                     |  5 +++--
 examples/collections.cc                   |  5 +++--
 examples/search.cc                        |  5 +++--
 examples/search_c.c                       |  5 +++--
 include/musicbrainz4/Alias.h              |  5 +++--
 include/musicbrainz4/AliasList.h          |  5 +++--
 include/musicbrainz4/Annotation.h         |  5 +++--
 include/musicbrainz4/AnnotationList.h     |  5 +++--
 include/musicbrainz4/Artist.h             |  5 +++--
 include/musicbrainz4/ArtistCredit.h       |  5 +++--
 include/musicbrainz4/ArtistList.h         |  5 +++--
 include/musicbrainz4/Attribute.h          |  5 +++--
 include/musicbrainz4/AttributeList.h      |  5 +++--
 include/musicbrainz4/CDStub.h             |  5 +++--
 include/musicbrainz4/CDStubList.h         |  5 +++--
 include/musicbrainz4/Collection.h         |  5 +++--
 include/musicbrainz4/CollectionList.h     |  5 +++--
 include/musicbrainz4/Disc.h               |  5 +++--
 include/musicbrainz4/DiscList.h           |  5 +++--
 include/musicbrainz4/Entity.h             |  5 +++--
 include/musicbrainz4/FreeDBDisc.h         |  5 +++--
 include/musicbrainz4/FreeDBDiscList.h     |  5 +++--
 include/musicbrainz4/HTTPFetch.h          |  5 +++--
 include/musicbrainz4/IPI.h                |  5 +++--
 include/musicbrainz4/IPIList.h            |  5 +++--
 include/musicbrainz4/ISRC.h               |  5 +++--
 include/musicbrainz4/ISRCList.h           |  5 +++--
 include/musicbrainz4/ISWC.h               |  5 +++--
 include/musicbrainz4/ISWCList.h           |  5 +++--
 include/musicbrainz4/Label.h              |  5 +++--
 include/musicbrainz4/LabelInfo.h          |  5 +++--
 include/musicbrainz4/LabelInfoList.h      |  5 +++--
 include/musicbrainz4/LabelList.h          |  5 +++--
 include/musicbrainz4/Lifespan.h           |  5 +++--
 include/musicbrainz4/List.h               |  5 +++--
 include/musicbrainz4/ListImpl.h           |  5 +++--
 include/musicbrainz4/Medium.h             |  5 +++--
 include/musicbrainz4/MediumList.h         |  5 +++--
 include/musicbrainz4/Message.h            |  5 +++--
 include/musicbrainz4/Metadata.h           |  5 +++--
 include/musicbrainz4/NameCredit.h         |  5 +++--
 include/musicbrainz4/NameCreditList.h     |  5 +++--
 include/musicbrainz4/NonMBTrack.h         |  5 +++--
 include/musicbrainz4/NonMBTrackList.h     |  5 +++--
 include/musicbrainz4/PUID.h               |  5 +++--
 include/musicbrainz4/PUIDList.h           |  5 +++--
 include/musicbrainz4/Query.h              |  5 +++--
 include/musicbrainz4/Rating.h             |  5 +++--
 include/musicbrainz4/Recording.h          |  5 +++--
 include/musicbrainz4/RecordingList.h      |  5 +++--
 include/musicbrainz4/Relation.h           |  5 +++--
 include/musicbrainz4/RelationList.h       |  5 +++--
 include/musicbrainz4/RelationListList.h   |  5 +++--
 include/musicbrainz4/Release.h            |  5 +++--
 include/musicbrainz4/ReleaseGroup.h       |  5 +++--
 include/musicbrainz4/ReleaseGroupList.h   |  5 +++--
 include/musicbrainz4/ReleaseList.h        |  5 +++--
 include/musicbrainz4/SecondaryType.h      |  5 +++--
 include/musicbrainz4/SecondaryTypeList.h  |  5 +++--
 include/musicbrainz4/Tag.h                |  5 +++--
 include/musicbrainz4/TagList.h            |  5 +++--
 include/musicbrainz4/TextRepresentation.h |  5 +++--
 include/musicbrainz4/Track.h              |  5 +++--
 include/musicbrainz4/TrackList.h          |  5 +++--
 include/musicbrainz4/UserRating.h         |  5 +++--
 include/musicbrainz4/UserTag.h            |  5 +++--
 include/musicbrainz4/UserTagList.h        |  5 +++--
 include/musicbrainz4/Work.h               |  5 +++--
 include/musicbrainz4/WorkList.h           |  5 +++--
 include/musicbrainz4/defines.h            |  5 +++--
 src/Alias.cc                              |  5 +++--
 src/Annotation.cc                         |  5 +++--
 src/Artist.cc                             |  5 +++--
 src/ArtistCredit.cc                       |  5 +++--
 src/Attribute.cc                          |  5 +++--
 src/CDStub.cc                             |  5 +++--
 src/Collection.cc                         |  5 +++--
 src/Disc.cc                               |  5 +++--
 src/Entity.cc                             |  5 +++--
 src/FreeDBDisc.cc                         |  5 +++--
 src/HTTPFetch.cc                          |  5 +++--
 src/IPI.cc                                |  5 +++--
 src/ISRC.cc                               |  5 +++--
 src/ISWC.cc                               |  5 +++--
 src/ISWCList.cc                           |  5 +++--
 src/Label.cc                              |  5 +++--
 src/LabelInfo.cc                          |  5 +++--
 src/Lifespan.cc                           |  5 +++--
 src/List.cc                               |  5 +++--
 src/Medium.cc                             |  5 +++--
 src/MediumList.cc                         |  5 +++--
 src/Message.cc                            |  5 +++--
 src/Metadata.cc                           |  5 +++--
 src/NameCredit.cc                         |  5 +++--
 src/NonMBTrack.cc                         |  5 +++--
 src/PUID.cc                               |  5 +++--
 src/Query.cc                              |  5 +++--
 src/Rating.cc                             |  5 +++--
 src/Recording.cc                          |  5 +++--
 src/Relation.cc                           |  5 +++--
 src/RelationList.cc                       |  5 +++--
 src/RelationListList.cc                   |  5 +++--
 src/Release.cc                            |  5 +++--
 src/ReleaseGroup.cc                       |  5 +++--
 src/SecondaryType.cc                      |  5 +++--
 src/SecondaryTypeList.cc                  |  5 +++--
 src/Tag.cc                                |  5 +++--
 src/TextRepresentation.cc                 |  5 +++--
 src/Track.cc                              |  5 +++--
 src/UserRating.cc                         |  5 +++--
 src/UserTag.cc                            |  5 +++--
 src/Work.cc                               |  5 +++--
 src/c-int-medium-defines.inc              |  5 +++--
 src/c-int-medium-source.inc               |  5 +++--
 src/c-int-query-defines.inc               |  5 +++--
 src/c-int-query-source.inc                |  5 +++--
 src/c-int-release-defines.inc             |  5 +++--
 src/c-int-release-source.inc              |  5 +++--
 src/c-int-source-funcs.inc                |  5 +++--
 src/cinterface.xml                        |  5 +++--
 src/make-c-interface.cc                   | 10 ++++++----
 tests/ctest.c                             |  5 +++--
 tests/mbtest.cc                           |  5 +++--
 124 files changed, 375 insertions(+), 250 deletions(-)

diff --git a/examples/cdlookup.cc b/examples/cdlookup.cc
index f7f7933..b40a5d0 100644
--- a/examples/cdlookup.cc
+++ b/examples/cdlookup.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/cdlookup_c.c b/examples/cdlookup_c.c
index c3d22c5..9efa2d4 100644
--- a/examples/cdlookup_c.c
+++ b/examples/cdlookup_c.c
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/collections.cc b/examples/collections.cc
index 913753a..b2526f8 100644
--- a/examples/collections.cc
+++ b/examples/collections.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/search.cc b/examples/search.cc
index 6144212..d5a7c5e 100644
--- a/examples/search.cc
+++ b/examples/search.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/examples/search_c.c b/examples/search_c.c
index 8fc650a..49ef3ee 100644
--- a/examples/search_c.c
+++ b/examples/search_c.c
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Alias.h b/include/musicbrainz4/Alias.h
index b8a9fdb..86d10a9 100644
--- a/include/musicbrainz4/Alias.h
+++ b/include/musicbrainz4/Alias.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/AliasList.h b/include/musicbrainz4/AliasList.h
index c35c53e..aaea21b 100644
--- a/include/musicbrainz4/AliasList.h
+++ b/include/musicbrainz4/AliasList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Annotation.h b/include/musicbrainz4/Annotation.h
index 5e0bf29..a735e6f 100644
--- a/include/musicbrainz4/Annotation.h
+++ b/include/musicbrainz4/Annotation.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/AnnotationList.h b/include/musicbrainz4/AnnotationList.h
index 3b0c51f..e8040e0 100644
--- a/include/musicbrainz4/AnnotationList.h
+++ b/include/musicbrainz4/AnnotationList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Artist.h b/include/musicbrainz4/Artist.h
index ba39f4c..ce5fdd4 100644
--- a/include/musicbrainz4/Artist.h
+++ b/include/musicbrainz4/Artist.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ArtistCredit.h b/include/musicbrainz4/ArtistCredit.h
index 8e25997..cd02cff 100644
--- a/include/musicbrainz4/ArtistCredit.h
+++ b/include/musicbrainz4/ArtistCredit.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ArtistList.h b/include/musicbrainz4/ArtistList.h
index 3c5b37e..80b1933 100644
--- a/include/musicbrainz4/ArtistList.h
+++ b/include/musicbrainz4/ArtistList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Attribute.h b/include/musicbrainz4/Attribute.h
index 2c8e2b5..9769387 100644
--- a/include/musicbrainz4/Attribute.h
+++ b/include/musicbrainz4/Attribute.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/AttributeList.h b/include/musicbrainz4/AttributeList.h
index 8293487..d417971 100644
--- a/include/musicbrainz4/AttributeList.h
+++ b/include/musicbrainz4/AttributeList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/CDStub.h b/include/musicbrainz4/CDStub.h
index c153748..de9a310 100644
--- a/include/musicbrainz4/CDStub.h
+++ b/include/musicbrainz4/CDStub.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/CDStubList.h b/include/musicbrainz4/CDStubList.h
index 02ac7d3..e37b4ef 100644
--- a/include/musicbrainz4/CDStubList.h
+++ b/include/musicbrainz4/CDStubList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Collection.h b/include/musicbrainz4/Collection.h
index 8c728e2..5c0a911 100644
--- a/include/musicbrainz4/Collection.h
+++ b/include/musicbrainz4/Collection.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/CollectionList.h b/include/musicbrainz4/CollectionList.h
index eb69478..270fee4 100644
--- a/include/musicbrainz4/CollectionList.h
+++ b/include/musicbrainz4/CollectionList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Disc.h b/include/musicbrainz4/Disc.h
index e4df0ef..d8a0e06 100644
--- a/include/musicbrainz4/Disc.h
+++ b/include/musicbrainz4/Disc.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/DiscList.h b/include/musicbrainz4/DiscList.h
index 4b4efa1..17a6821 100644
--- a/include/musicbrainz4/DiscList.h
+++ b/include/musicbrainz4/DiscList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Entity.h b/include/musicbrainz4/Entity.h
index f191df3..06c291c 100644
--- a/include/musicbrainz4/Entity.h
+++ b/include/musicbrainz4/Entity.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/FreeDBDisc.h b/include/musicbrainz4/FreeDBDisc.h
index 02806b2..6ce31f4 100644
--- a/include/musicbrainz4/FreeDBDisc.h
+++ b/include/musicbrainz4/FreeDBDisc.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/FreeDBDiscList.h b/include/musicbrainz4/FreeDBDiscList.h
index f578186..7f53828 100644
--- a/include/musicbrainz4/FreeDBDiscList.h
+++ b/include/musicbrainz4/FreeDBDiscList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/HTTPFetch.h b/include/musicbrainz4/HTTPFetch.h
index 461e7bb..4aff0ae 100644
--- a/include/musicbrainz4/HTTPFetch.h
+++ b/include/musicbrainz4/HTTPFetch.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/IPI.h b/include/musicbrainz4/IPI.h
index 3f2248c..ae9ce3d 100644
--- a/include/musicbrainz4/IPI.h
+++ b/include/musicbrainz4/IPI.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/IPIList.h b/include/musicbrainz4/IPIList.h
index eac0fa1..738cc2d 100644
--- a/include/musicbrainz4/IPIList.h
+++ b/include/musicbrainz4/IPIList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ISRC.h b/include/musicbrainz4/ISRC.h
index 2f346dc..a2c30be 100644
--- a/include/musicbrainz4/ISRC.h
+++ b/include/musicbrainz4/ISRC.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ISRCList.h b/include/musicbrainz4/ISRCList.h
index 3948531..7d1d787 100644
--- a/include/musicbrainz4/ISRCList.h
+++ b/include/musicbrainz4/ISRCList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ISWC.h b/include/musicbrainz4/ISWC.h
index d4745e9..176923f 100644
--- a/include/musicbrainz4/ISWC.h
+++ b/include/musicbrainz4/ISWC.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ISWCList.h b/include/musicbrainz4/ISWCList.h
index c2f9512..87d12e0 100644
--- a/include/musicbrainz4/ISWCList.h
+++ b/include/musicbrainz4/ISWCList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Label.h b/include/musicbrainz4/Label.h
index 3e04e6e..225bd12 100644
--- a/include/musicbrainz4/Label.h
+++ b/include/musicbrainz4/Label.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/LabelInfo.h b/include/musicbrainz4/LabelInfo.h
index 452212c..8635521 100644
--- a/include/musicbrainz4/LabelInfo.h
+++ b/include/musicbrainz4/LabelInfo.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/LabelInfoList.h b/include/musicbrainz4/LabelInfoList.h
index ce912ec..6dba23b 100644
--- a/include/musicbrainz4/LabelInfoList.h
+++ b/include/musicbrainz4/LabelInfoList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/LabelList.h b/include/musicbrainz4/LabelList.h
index da5956f..1f5c706 100644
--- a/include/musicbrainz4/LabelList.h
+++ b/include/musicbrainz4/LabelList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Lifespan.h b/include/musicbrainz4/Lifespan.h
index d6a4782..b7c98cb 100644
--- a/include/musicbrainz4/Lifespan.h
+++ b/include/musicbrainz4/Lifespan.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/List.h b/include/musicbrainz4/List.h
index 4d0cdff..407c16f 100644
--- a/include/musicbrainz4/List.h
+++ b/include/musicbrainz4/List.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ListImpl.h b/include/musicbrainz4/ListImpl.h
index 1650222..f5ace00 100644
--- a/include/musicbrainz4/ListImpl.h
+++ b/include/musicbrainz4/ListImpl.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Medium.h b/include/musicbrainz4/Medium.h
index 3cab072..df929ec 100644
--- a/include/musicbrainz4/Medium.h
+++ b/include/musicbrainz4/Medium.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/MediumList.h b/include/musicbrainz4/MediumList.h
index 1050509..5d50e4a 100644
--- a/include/musicbrainz4/MediumList.h
+++ b/include/musicbrainz4/MediumList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Message.h b/include/musicbrainz4/Message.h
index b1977c4..ab17ddb 100644
--- a/include/musicbrainz4/Message.h
+++ b/include/musicbrainz4/Message.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Metadata.h b/include/musicbrainz4/Metadata.h
index 00b04dc..6591079 100644
--- a/include/musicbrainz4/Metadata.h
+++ b/include/musicbrainz4/Metadata.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/NameCredit.h b/include/musicbrainz4/NameCredit.h
index a05baea..fe2c61b 100644
--- a/include/musicbrainz4/NameCredit.h
+++ b/include/musicbrainz4/NameCredit.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/NameCreditList.h b/include/musicbrainz4/NameCreditList.h
index 565a075..324a34c 100644
--- a/include/musicbrainz4/NameCreditList.h
+++ b/include/musicbrainz4/NameCreditList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/NonMBTrack.h b/include/musicbrainz4/NonMBTrack.h
index 31d2e2a..50802e9 100644
--- a/include/musicbrainz4/NonMBTrack.h
+++ b/include/musicbrainz4/NonMBTrack.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/NonMBTrackList.h b/include/musicbrainz4/NonMBTrackList.h
index e96b602..2ffe43f 100644
--- a/include/musicbrainz4/NonMBTrackList.h
+++ b/include/musicbrainz4/NonMBTrackList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/PUID.h b/include/musicbrainz4/PUID.h
index 5cd02f6..4a52ee6 100644
--- a/include/musicbrainz4/PUID.h
+++ b/include/musicbrainz4/PUID.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/PUIDList.h b/include/musicbrainz4/PUIDList.h
index 938c5d6..3116bf9 100644
--- a/include/musicbrainz4/PUIDList.h
+++ b/include/musicbrainz4/PUIDList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Query.h b/include/musicbrainz4/Query.h
index d6766c7..61902ba 100644
--- a/include/musicbrainz4/Query.h
+++ b/include/musicbrainz4/Query.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Rating.h b/include/musicbrainz4/Rating.h
index 0ecda85..d9afec9 100644
--- a/include/musicbrainz4/Rating.h
+++ b/include/musicbrainz4/Rating.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Recording.h b/include/musicbrainz4/Recording.h
index 00900ed..c240e42 100644
--- a/include/musicbrainz4/Recording.h
+++ b/include/musicbrainz4/Recording.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/RecordingList.h b/include/musicbrainz4/RecordingList.h
index e7db129..ca53ce7 100644
--- a/include/musicbrainz4/RecordingList.h
+++ b/include/musicbrainz4/RecordingList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Relation.h b/include/musicbrainz4/Relation.h
index 9cb2bd3..2a66e45 100644
--- a/include/musicbrainz4/Relation.h
+++ b/include/musicbrainz4/Relation.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/RelationList.h b/include/musicbrainz4/RelationList.h
index dd361b0..fa78b0a 100644
--- a/include/musicbrainz4/RelationList.h
+++ b/include/musicbrainz4/RelationList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/RelationListList.h b/include/musicbrainz4/RelationListList.h
index 5197f9c..ebc30c9 100644
--- a/include/musicbrainz4/RelationListList.h
+++ b/include/musicbrainz4/RelationListList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Release.h b/include/musicbrainz4/Release.h
index 972fa1c..c4d0682 100644
--- a/include/musicbrainz4/Release.h
+++ b/include/musicbrainz4/Release.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ReleaseGroup.h b/include/musicbrainz4/ReleaseGroup.h
index 779fc27..e1ee708 100644
--- a/include/musicbrainz4/ReleaseGroup.h
+++ b/include/musicbrainz4/ReleaseGroup.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ReleaseGroupList.h b/include/musicbrainz4/ReleaseGroupList.h
index 76fd0d3..682fe1b 100644
--- a/include/musicbrainz4/ReleaseGroupList.h
+++ b/include/musicbrainz4/ReleaseGroupList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/ReleaseList.h b/include/musicbrainz4/ReleaseList.h
index 90a6def..b73b73b 100644
--- a/include/musicbrainz4/ReleaseList.h
+++ b/include/musicbrainz4/ReleaseList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/SecondaryType.h b/include/musicbrainz4/SecondaryType.h
index 21c7e4f..feadb0a 100644
--- a/include/musicbrainz4/SecondaryType.h
+++ b/include/musicbrainz4/SecondaryType.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/SecondaryTypeList.h b/include/musicbrainz4/SecondaryTypeList.h
index fe061df..383b0ed 100644
--- a/include/musicbrainz4/SecondaryTypeList.h
+++ b/include/musicbrainz4/SecondaryTypeList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Tag.h b/include/musicbrainz4/Tag.h
index 05ac70a..0260588 100644
--- a/include/musicbrainz4/Tag.h
+++ b/include/musicbrainz4/Tag.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/TagList.h b/include/musicbrainz4/TagList.h
index 9744dd3..0e969ef 100644
--- a/include/musicbrainz4/TagList.h
+++ b/include/musicbrainz4/TagList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/TextRepresentation.h b/include/musicbrainz4/TextRepresentation.h
index 436caaf..940fbcd 100644
--- a/include/musicbrainz4/TextRepresentation.h
+++ b/include/musicbrainz4/TextRepresentation.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Track.h b/include/musicbrainz4/Track.h
index 11852c8..5d74bd3 100644
--- a/include/musicbrainz4/Track.h
+++ b/include/musicbrainz4/Track.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/TrackList.h b/include/musicbrainz4/TrackList.h
index 5a4b311..fc3b02a 100644
--- a/include/musicbrainz4/TrackList.h
+++ b/include/musicbrainz4/TrackList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/UserRating.h b/include/musicbrainz4/UserRating.h
index 2f91e9e..45daa01 100644
--- a/include/musicbrainz4/UserRating.h
+++ b/include/musicbrainz4/UserRating.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/UserTag.h b/include/musicbrainz4/UserTag.h
index fba5673..d8a4f1d 100644
--- a/include/musicbrainz4/UserTag.h
+++ b/include/musicbrainz4/UserTag.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/UserTagList.h b/include/musicbrainz4/UserTagList.h
index fd10543..880ab2b 100644
--- a/include/musicbrainz4/UserTagList.h
+++ b/include/musicbrainz4/UserTagList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/Work.h b/include/musicbrainz4/Work.h
index 4ecb3b0..8507b95 100644
--- a/include/musicbrainz4/Work.h
+++ b/include/musicbrainz4/Work.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/WorkList.h b/include/musicbrainz4/WorkList.h
index b74b979..407d180 100644
--- a/include/musicbrainz4/WorkList.h
+++ b/include/musicbrainz4/WorkList.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/musicbrainz4/defines.h b/include/musicbrainz4/defines.h
index e28e309..73051a7 100644
--- a/include/musicbrainz4/defines.h
+++ b/include/musicbrainz4/defines.h
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Alias.cc b/src/Alias.cc
index ff6ff8c..749f384 100644
--- a/src/Alias.cc
+++ b/src/Alias.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Annotation.cc b/src/Annotation.cc
index 6a7b83a..74ee96a 100644
--- a/src/Annotation.cc
+++ b/src/Annotation.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Artist.cc b/src/Artist.cc
index 15f7736..6267ee9 100644
--- a/src/Artist.cc
+++ b/src/Artist.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ArtistCredit.cc b/src/ArtistCredit.cc
index 2c4605d..280aa8b 100644
--- a/src/ArtistCredit.cc
+++ b/src/ArtistCredit.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Attribute.cc b/src/Attribute.cc
index 0f30b3d..6e28e1a 100644
--- a/src/Attribute.cc
+++ b/src/Attribute.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/CDStub.cc b/src/CDStub.cc
index 0c65ba1..d517132 100644
--- a/src/CDStub.cc
+++ b/src/CDStub.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Collection.cc b/src/Collection.cc
index 374b58a..5edf85a 100644
--- a/src/Collection.cc
+++ b/src/Collection.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Disc.cc b/src/Disc.cc
index aec2b21..5cb8c6a 100644
--- a/src/Disc.cc
+++ b/src/Disc.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Entity.cc b/src/Entity.cc
index ed5a3a1..b9bc059 100644
--- a/src/Entity.cc
+++ b/src/Entity.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/FreeDBDisc.cc b/src/FreeDBDisc.cc
index 4d69f79..481d2f4 100644
--- a/src/FreeDBDisc.cc
+++ b/src/FreeDBDisc.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/HTTPFetch.cc b/src/HTTPFetch.cc
index 251b672..979ad92 100644
--- a/src/HTTPFetch.cc
+++ b/src/HTTPFetch.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/IPI.cc b/src/IPI.cc
index 4fa15ea..13c8615 100644
--- a/src/IPI.cc
+++ b/src/IPI.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ISRC.cc b/src/ISRC.cc
index 5e55746..6afd544 100644
--- a/src/ISRC.cc
+++ b/src/ISRC.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ISWC.cc b/src/ISWC.cc
index 7a3646c..8c9d0ae 100644
--- a/src/ISWC.cc
+++ b/src/ISWC.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ISWCList.cc b/src/ISWCList.cc
index 4f37028..b35d29a 100644
--- a/src/ISWCList.cc
+++ b/src/ISWCList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Label.cc b/src/Label.cc
index 482adc2..b561399 100644
--- a/src/Label.cc
+++ b/src/Label.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/LabelInfo.cc b/src/LabelInfo.cc
index fa645f4..696e8aa 100644
--- a/src/LabelInfo.cc
+++ b/src/LabelInfo.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Lifespan.cc b/src/Lifespan.cc
index 8dffdd5..d15ce1e 100644
--- a/src/Lifespan.cc
+++ b/src/Lifespan.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/List.cc b/src/List.cc
index 8ea5309..892414f 100644
--- a/src/List.cc
+++ b/src/List.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Medium.cc b/src/Medium.cc
index f4be8ee..92a1226 100644
--- a/src/Medium.cc
+++ b/src/Medium.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/MediumList.cc b/src/MediumList.cc
index d9661e1..a25937c 100644
--- a/src/MediumList.cc
+++ b/src/MediumList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Message.cc b/src/Message.cc
index 3e1800b..418bdfe 100644
--- a/src/Message.cc
+++ b/src/Message.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Metadata.cc b/src/Metadata.cc
index e203d2c..5a73e10 100644
--- a/src/Metadata.cc
+++ b/src/Metadata.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/NameCredit.cc b/src/NameCredit.cc
index 6fd5c92..5701ac6 100644
--- a/src/NameCredit.cc
+++ b/src/NameCredit.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/NonMBTrack.cc b/src/NonMBTrack.cc
index 2744608..d40614b 100644
--- a/src/NonMBTrack.cc
+++ b/src/NonMBTrack.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/PUID.cc b/src/PUID.cc
index e197d7f..1f4367f 100644
--- a/src/PUID.cc
+++ b/src/PUID.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Query.cc b/src/Query.cc
index 36e3c11..cb6f209 100644
--- a/src/Query.cc
+++ b/src/Query.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Rating.cc b/src/Rating.cc
index 6ae7904..b43838e 100644
--- a/src/Rating.cc
+++ b/src/Rating.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Recording.cc b/src/Recording.cc
index 67cee24..3fcb42a 100644
--- a/src/Recording.cc
+++ b/src/Recording.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Relation.cc b/src/Relation.cc
index 75278a0..e1d3129 100644
--- a/src/Relation.cc
+++ b/src/Relation.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/RelationList.cc b/src/RelationList.cc
index 3445c06..514ea99 100644
--- a/src/RelationList.cc
+++ b/src/RelationList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/RelationListList.cc b/src/RelationListList.cc
index 90283c4..4797952 100644
--- a/src/RelationListList.cc
+++ b/src/RelationListList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Release.cc b/src/Release.cc
index 569daaf..9eb67f8 100644
--- a/src/Release.cc
+++ b/src/Release.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/ReleaseGroup.cc b/src/ReleaseGroup.cc
index 380a802..9fe3781 100644
--- a/src/ReleaseGroup.cc
+++ b/src/ReleaseGroup.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/SecondaryType.cc b/src/SecondaryType.cc
index 66fa756..f5e1dd1 100644
--- a/src/SecondaryType.cc
+++ b/src/SecondaryType.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/SecondaryTypeList.cc b/src/SecondaryTypeList.cc
index f45f1e5..94296c8 100644
--- a/src/SecondaryTypeList.cc
+++ b/src/SecondaryTypeList.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Tag.cc b/src/Tag.cc
index f42f35d..f3a22bc 100644
--- a/src/Tag.cc
+++ b/src/Tag.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/TextRepresentation.cc b/src/TextRepresentation.cc
index 07db00c..f9c9b3a 100644
--- a/src/TextRepresentation.cc
+++ b/src/TextRepresentation.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Track.cc b/src/Track.cc
index 517f280..e256355 100644
--- a/src/Track.cc
+++ b/src/Track.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/UserRating.cc b/src/UserRating.cc
index 44d901e..d4442a4 100644
--- a/src/UserRating.cc
+++ b/src/UserRating.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/UserTag.cc b/src/UserTag.cc
index 79101dd..d34d380 100644
--- a/src/UserTag.cc
+++ b/src/UserTag.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/Work.cc b/src/Work.cc
index a6c6468..1e5714d 100644
--- a/src/Work.cc
+++ b/src/Work.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-medium-defines.inc b/src/c-int-medium-defines.inc
index e8329aa..694c681 100644
--- a/src/c-int-medium-defines.inc
+++ b/src/c-int-medium-defines.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-medium-source.inc b/src/c-int-medium-source.inc
index eb8e9b9..fcafb79 100644
--- a/src/c-int-medium-source.inc
+++ b/src/c-int-medium-source.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-query-defines.inc b/src/c-int-query-defines.inc
index 63cceb4..f0967e8 100644
--- a/src/c-int-query-defines.inc
+++ b/src/c-int-query-defines.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-query-source.inc b/src/c-int-query-source.inc
index f121dd8..40c7efa 100644
--- a/src/c-int-query-source.inc
+++ b/src/c-int-query-source.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-release-defines.inc b/src/c-int-release-defines.inc
index 39b887c..9ebe48f 100644
--- a/src/c-int-release-defines.inc
+++ b/src/c-int-release-defines.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-release-source.inc b/src/c-int-release-source.inc
index 147d5e8..6f0bae5 100644
--- a/src/c-int-release-source.inc
+++ b/src/c-int-release-source.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/c-int-source-funcs.inc b/src/c-int-source-funcs.inc
index 2caa063..f8f36a6 100644
--- a/src/c-int-source-funcs.inc
+++ b/src/c-int-source-funcs.inc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/cinterface.xml b/src/cinterface.xml
index 903c6bc..4eb4e2e 100644
--- a/src/cinterface.xml
+++ b/src/cinterface.xml
@@ -8,8 +8,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/make-c-interface.cc b/src/make-c-interface.cc
index fd637cf..8f5ad30 100644
--- a/src/make-c-interface.cc
+++ b/src/make-c-interface.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -136,8 +137,9 @@ void ProcessHeader(const XMLNode& /*Node*/, std::ofstream& Source, std::ofstream
 	os << "   This file is part of libmusicbrainz4." << std::endl;
 	os << std::endl;
 	os << "   This library is free software; you can redistribute it and/or" << std::endl;
-	os << "   modify it under the terms of v2 of the GNU Lesser General Public" << std::endl;
-	os << "   License as published by the Free Software Foundation." << std::endl;
+	os << "   modify it under the terms of the GNU Lesser General Public" << std::endl;
+	os << "   License as published by the Free Software Foundation; either" << std::endl;
+	os << "   version 2.1 of the License, or (at your option) any later version." << std::endl;
 	os << std::endl;
 	os << "   libmusicbrainz4 is distributed in the hope that it will be useful," << std::endl;
 	os << "   but WITHOUT ANY WARRANTY; without even the implied warranty of" << std::endl;
diff --git a/tests/ctest.c b/tests/ctest.c
index 3b528a6..bd5011c 100644
--- a/tests/ctest.c
+++ b/tests/ctest.c
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/tests/mbtest.cc b/tests/mbtest.cc
index f780c6d..08bcb48 100644
--- a/tests/mbtest.cc
+++ b/tests/mbtest.cc
@@ -7,8 +7,9 @@
    This file is part of libmusicbrainz4.
 
    This library is free software; you can redistribute it and/or
-   modify it under the terms of v2 of the GNU Lesser General Public
-   License as published by the Free Software Foundation.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    libmusicbrainz4 is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
1.7.11.5

openSUSE Build Service is sponsored by