diff --git a/COPYING b/COPYING
index d60c31a97a544b53039088d14fe9114583c0efc3..94a9ed024d3859793618152ea559a168bbcbb5e2 100644
--- a/COPYING
+++ b/COPYING
@@ -1,285 +1,626 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
   For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
 
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms.
 
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) <year>  <name of author>
 
-    This program is free software; you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
@@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
 The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Makefile.am b/Makefile.am
index e037dccb7d6a093baccbe708f0e4b8123864e734..733cfacf59d8bd4167357ee0f1c3c46c399eba5f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if WITH_INCLUDED_BUDDY
   MAYBE_BUDDY = buddy
diff --git a/NEWS b/NEWS
index a35cffd2de46ac80b2791cd60b55e8dbdc3dbb81..393dd02130f7007745e5483a53d21739541c876b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 New in spot 0.9.2a:
 
+  * License change: Spot is now distributed using GPL v3+ instead
+    of GPL v2+.  This is because we started using some third-party
+    files distributed under GPL v3+.
+
   * Command-line tools
 
     Useful command-line tools are now installed in addition to the
diff --git a/bench/Makefile.am b/bench/Makefile.am
index cbe987db549949fd1955d77a2f6fa23b026fa037..06810b65af694f98e28528ef5e095fa0e38f4c99 100644
--- a/bench/Makefile.am
+++ b/bench/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = emptchk ltl2tgba scc-stats split-product ltlcounter	\
           ltlclasses wdba
diff --git a/bench/emptchk/Makefile.am b/bench/emptchk/Makefile.am
index 239cf574712087a649d312bc77f9f781db2c221f..6110f9c3160569048b106f05082c362f5a231cd9 100644
--- a/bench/emptchk/Makefile.am
+++ b/bench/emptchk/Makefile.am
@@ -6,7 +6,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 PML2TGBA = $(PERL) $(srcdir)/pml2tgba.pl
diff --git a/bench/emptchk/defs.in b/bench/emptchk/defs.in
index 7694da253710b1727fd43ff6ff739da314c21d37..d7275f2c6f82dd4ef5ec6959851556fbe7c4b493 100644
--- a/bench/emptchk/defs.in
+++ b/bench/emptchk/defs.in
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/bench/emptchk/ltl-human.sh b/bench/emptchk/ltl-human.sh
index 94fd9b3475a542380b1337f3e67b621f65a7ac6a..e85991fb15dbab8b7a3e97052156ffa955d5cf2c 100644
--- a/bench/emptchk/ltl-human.sh
+++ b/bench/emptchk/ltl-human.sh
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/bench/emptchk/ltl-random.sh b/bench/emptchk/ltl-random.sh
index fedc338f22d855faf042c0d2752d2162a63bbe18..2c6108c555e4ccf37a2f9851a4475fda2dab5917 100644
--- a/bench/emptchk/ltl-random.sh
+++ b/bench/emptchk/ltl-random.sh
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/bench/emptchk/pml-clserv.sh b/bench/emptchk/pml-clserv.sh
index 3e2cf9d293ebeb702a9ba84c7080c4c2ff2046fa..e75d13e4534a6f2e4b7c5d4f01a501c8aecea7e8 100644
--- a/bench/emptchk/pml-clserv.sh
+++ b/bench/emptchk/pml-clserv.sh
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/bench/emptchk/pml-eeaean.sh b/bench/emptchk/pml-eeaean.sh
index 265fa68d268cd2fa25f76261e5f536252a15a1f2..9257cb9e52809dc563645e37a675add69bd06803 100644
--- a/bench/emptchk/pml-eeaean.sh
+++ b/bench/emptchk/pml-eeaean.sh
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/bench/emptchk/pml2tgba.pl b/bench/emptchk/pml2tgba.pl
index 27931c507509745683bf7a6751269b5afdb1d870..61f5e05652c865467d78ceb79eed28391a193ee0 100755
--- a/bench/emptchk/pml2tgba.pl
+++ b/bench/emptchk/pml2tgba.pl
@@ -4,7 +4,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
-#
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.#
 #
 # This script was originally distributed by Schwoon alongside
 #
diff --git a/bench/ltl2tgba/big b/bench/ltl2tgba/big
index 54b422872712a5ed7202d35057cc8eb0c2f34902..f3c9b3f67ffd3c9106e11232b6ac42e16242ed60 100755
--- a/bench/ltl2tgba/big
+++ b/bench/ltl2tgba/big
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/bench/ltl2tgba/defs.in b/bench/ltl2tgba/defs.in
index a963e0c1acdd80515403aa2ab9303b6531c571d1..311577e0086d904e3592c59e15d6ae8ba0ad8223 100644
--- a/bench/ltl2tgba/defs.in
+++ b/bench/ltl2tgba/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/bench/ltl2tgba/known b/bench/ltl2tgba/known
index 2dfbd9986e2e844513e95e6c332b8cc76b0475ce..9fd17230b7eee8e234945e98aa0eac758cf46f0a 100755
--- a/bench/ltl2tgba/known
+++ b/bench/ltl2tgba/known
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/bench/ltl2tgba/lbtt2csv.pl b/bench/ltl2tgba/lbtt2csv.pl
index 47f522ceb09868d3671c296399798c0b57f5e795..28f5e0249f024bb1b5150effe5713686594c24d6 100755
--- a/bench/ltl2tgba/lbtt2csv.pl
+++ b/bench/ltl2tgba/lbtt2csv.pl
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This script reads the output of the files "*.log" given in arguments
diff --git a/bench/ltl2tgba/ltl2baw.in b/bench/ltl2tgba/ltl2baw.in
index a59e85720c52a978cde7e1a4e20499e94f2e1e06..e0c5f6de8da8ba156df097a5dadfea732e32ee7a 100644
--- a/bench/ltl2tgba/ltl2baw.in
+++ b/bench/ltl2tgba/ltl2baw.in
@@ -8,7 +8,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use warnings;
 
diff --git a/bench/ltl2tgba/parseout.pl b/bench/ltl2tgba/parseout.pl
index de62035aadbc2560e58e775738275a51d60c4d18..9f7d490404bb2b552d1cf671442c197e0f198128 100755
--- a/bench/ltl2tgba/parseout.pl
+++ b/bench/ltl2tgba/parseout.pl
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 use warnings;
 
diff --git a/bench/ltl2tgba/small b/bench/ltl2tgba/small
index 339e442eb10bfb63f7b5f685f7371b513c24e811..b1ff44d1b7469e4e28b8f77521a30033498d04c3 100755
--- a/bench/ltl2tgba/small
+++ b/bench/ltl2tgba/small
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/bench/ltlclasses/Makefile.am b/bench/ltlclasses/Makefile.am
index 4ee518adc18e4268fa2871253ca4506829326e5a..97f42d5d45a8ed50a3712ab8c47fe78b58003b50 100644
--- a/bench/ltlclasses/Makefile.am
+++ b/bench/ltlclasses/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = run plot.gnu
 
diff --git a/bench/ltlclasses/defs.in b/bench/ltlclasses/defs.in
index 9591b478abf335a17f5575f92085f1856dd41cef..9d86b391db74293e1f0a37b2e9883add260d3f06 100644
--- a/bench/ltlclasses/defs.in
+++ b/bench/ltlclasses/defs.in
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/bench/ltlclasses/run b/bench/ltlclasses/run
index 0483e01265826329e6f331aa2a92db005cd40445..c0ac6f39725a9676613ef06ab510bcb8851cefd1 100755
--- a/bench/ltlclasses/run
+++ b/bench/ltlclasses/run
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/bench/ltlcounter/Makefile.am b/bench/ltlcounter/Makefile.am
index 4efee8761488b98f35f3898e9bbd0457a7da22ab..543b453790835730fedeeceae8e58c2c871f27c3 100644
--- a/bench/ltlcounter/Makefile.am
+++ b/bench/ltlcounter/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = run plot.gnu
 
diff --git a/bench/ltlcounter/defs.in b/bench/ltlcounter/defs.in
index 20729104f2a4e4f6dde5b024d008ff785fce2326..c27676c07c095a8f529485836cfaba2bf782908d 100644
--- a/bench/ltlcounter/defs.in
+++ b/bench/ltlcounter/defs.in
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/bench/ltlcounter/run b/bench/ltlcounter/run
index 70eb65df5a028c7d39a8feddd77bb0803c6f3717..fea8c687ea3a874dd12bf4b62a471dc17e4c11c0 100755
--- a/bench/ltlcounter/run
+++ b/bench/ltlcounter/run
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/bench/scc-stats/Makefile.am b/bench/scc-stats/Makefile.am
index 0d98f600f654ece4e9ab581d37d22fe50f5ac89d..0dca5302703cd19ff44427e27b89f150fbe2805c 100644
--- a/bench/scc-stats/Makefile.am
+++ b/bench/scc-stats/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/../../src $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/bench/scc-stats/stats.cc b/bench/scc-stats/stats.cc
index 89adacfbee36c9c5eeb8653066c35616a78ecab9..b33eec0eee1ce7bbaa4c251eb13b763601e32178 100644
--- a/bench/scc-stats/stats.cc
+++ b/bench/scc-stats/stats.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <queue>
 #include <math.h>
diff --git a/bench/split-product/Makefile.am b/bench/split-product/Makefile.am
index 57fc1eb683d3dbf634f47266b3130e37af1aa690..92764910d4e7aec9a4be55d547b5a0acc2c72a56 100644
--- a/bench/split-product/Makefile.am
+++ b/bench/split-product/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 PML2TGBA = $(PERL) $(srcdir)/pml2tgba.pl
 
diff --git a/bench/split-product/cutscc.cc b/bench/split-product/cutscc.cc
index d2e54d4189f0f9c40ae78436aeb59995840fc45b..6b48f3993ca3406628e9344c1d147552c41a6dbe 100644
--- a/bench/split-product/cutscc.cc
+++ b/bench/split-product/cutscc.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <queue>
 #include <limits>
diff --git a/bench/split-product/pml2tgba.pl b/bench/split-product/pml2tgba.pl
index 4fdd76c39c2aaf56fa152c0746fa1ab532e2acf4..fef5294e4fd78e4473883deb44d719a0d8e93832 100755
--- a/bench/split-product/pml2tgba.pl
+++ b/bench/split-product/pml2tgba.pl
@@ -4,7 +4,7 @@
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
-#
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.#
 #
 # This script was originally distributed by Schwoon alongside
 #
diff --git a/bench/wdba/Makefile.am b/bench/wdba/Makefile.am
index 25d16a4f84b700e0174750631d8aaeadbd4e4138..6cff187c38fc0cf3358865edce4912768ee286bf 100644
--- a/bench/wdba/Makefile.am
+++ b/bench/wdba/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = run
 
diff --git a/bench/wdba/defs.in b/bench/wdba/defs.in
index 20729104f2a4e4f6dde5b024d008ff785fce2326..c27676c07c095a8f529485836cfaba2bf782908d 100644
--- a/bench/wdba/defs.in
+++ b/bench/wdba/defs.in
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/bench/wdba/run b/bench/wdba/run
index b41cf36a732583045e4d5fb0a9d1cb1a3cf6d56b..52509c12060c3b7256994dff22233f5862dc4ce9 100755
--- a/bench/wdba/run
+++ b/bench/wdba/run
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/configure.ac b/configure.ac
index bafcc7739a9b84832bc81a87b9ccd051566d724d..0d033dd27d219193ae47684568c842092d6cce94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.61])
 AC_INIT([spot], [0.9.2a], [spot@lrde.epita.fr])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3002f4ac640bec350d48f13f965797a2d0644ec6..1474375474f154ce815e385205b3d3e2b981965a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 DOXYGEN = doxygen
 
diff --git a/doc/dot.in b/doc/dot.in
index 09bffd21c1c06527b012859e418e291c16210859..f31007347bd80177df1e838132a2c6a1c472e40b 100644
--- a/doc/dot.in
+++ b/doc/dot.in
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Rewrite any -Tpng argument as -Tpng:gd, the resulting files are 10
 # times smaller because they are not anti-aliased.
diff --git a/doc/tl/Makefile.am b/doc/tl/Makefile.am
index f72c07a851710f0a1e95e398983b1290c657773e..489f4e2cdfaae5358d2309b6d3edd56074cbf6d3 100644
--- a/doc/tl/Makefile.am
+++ b/doc/tl/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 all: $(srcdir)/tl.pdf
diff --git a/iface/Makefile.am b/iface/Makefile.am
index f7a5f87f8331b3614313c2e3f5de07c71a649eab..c5f5346a4fc8c804d3050967f487a80da438bc6e 100644
--- a/iface/Makefile.am
+++ b/iface/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = dve2
 
diff --git a/iface/dve2/Makefile.am b/iface/dve2/Makefile.am
index 5d20765a8d29371ed9ae7c96e7c0cbfa7034cce0..0a571226a5ea953338dca6624663e28a29b867a1 100644
--- a/iface/dve2/Makefile.am
+++ b/iface/dve2/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src \
               $(BUDDY_CPPFLAGS) -I$(top_srcdir)/ltdl
diff --git a/iface/dve2/defs.in b/iface/dve2/defs.in
index fc2346ea7486c115e8990e4451c3cfcc000442af..2be5471e9583ea0912a937f25beb7f1425bcbacd 100644
--- a/iface/dve2/defs.in
+++ b/iface/dve2/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/iface/dve2/dve2.cc b/iface/dve2/dve2.cc
index 76b82edb688296192b9da4a47450dfdb5a454ab0..f323e76ebd19f596f4fbda615e379ef80569aee4 100644
--- a/iface/dve2/dve2.cc
+++ b/iface/dve2/dve2.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ltdl.h>
 #include <cstring>
diff --git a/iface/dve2/dve2.hh b/iface/dve2/dve2.hh
index 93d738c6022405dd9b1147a8cb9e8ad8b2ffdc43..fa0745eb5c9288f0bd622d3a5e5a22878b58bc7e 100644
--- a/iface/dve2/dve2.hh
+++ b/iface/dve2/dve2.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_IFACE_DVE2_DVE2_HH
 # define SPOT_IFACE_DVE2_DVE2_HH
diff --git a/iface/dve2/dve2check.cc b/iface/dve2/dve2check.cc
index 30fef393ec3bfc7ab9adac91871ac92deaa2bf13..a0306ee064de5b6f9ba917fc74191a1c79426263 100644
--- a/iface/dve2/dve2check.cc
+++ b/iface/dve2/dve2check.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "dve2.hh"
 #include "tgbaalgos/dotty.hh"
diff --git a/iface/dve2/dve2check.test b/iface/dve2/dve2check.test
index 6cda6ff3229d9e5631459ecf8ed8a63e464bca64..cb1f18b830a28d6fe51f0a2c04b2c9b5a0cafc79 100755
--- a/iface/dve2/dve2check.test
+++ b/iface/dve2/dve2check.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/iface/dve2/finite.test b/iface/dve2/finite.test
index b5f64ce3d12a9c927ef5dc66965ad4e7fc9b2920..26cfceed36261b3fc1e8cfc42ac37fd81fd049e9 100755
--- a/iface/dve2/finite.test
+++ b/iface/dve2/finite.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/iface/dve2/kripke.test b/iface/dve2/kripke.test
index 754dd479fa941837c21f365dac71ede2e8abd3d3..7ac73f3bcd03fe5cfdffc7705228afdbd6d54c3e 100755
--- a/iface/dve2/kripke.test
+++ b/iface/dve2/kripke.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
diff --git a/iface/gspn/Makefile.am b/iface/gspn/Makefile.am
index 63aa2214a4937adcae151128089d42747cf2227e..d8e5861d55a18968b0d68eee0919bf3cb7ee9f5f 100644
--- a/iface/gspn/Makefile.am
+++ b/iface/gspn/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(top_srcdir)/src $(BUDDY_CPPFLAGS) $(LIBGSPN_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/iface/gspn/common.cc b/iface/gspn/common.cc
index 62302f0ba4043d8aaa2f77620b5cc17bffd17b14..8f2dd033fa81a53db206efed3a8bfba23292aa49 100644
--- a/iface/gspn/common.cc
+++ b/iface/gspn/common.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common.hh"
 #include <ostream>
diff --git a/iface/gspn/common.hh b/iface/gspn/common.hh
index 4518dda1e2f9b8f109e74e9e6d5ac462c065568c..45ce9c95b8da32a0859f1e27951f53e97e8f4586 100644
--- a/iface/gspn/common.hh
+++ b/iface/gspn/common.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_IFACE_GSPN_COMMON_HH
 # define SPOT_IFACE_GSPN_COMMON_HH
diff --git a/iface/gspn/dcswave.test b/iface/gspn/dcswave.test
index ee679172d44fb78ec62cf5a2e58c92d4553da5f3..20319ecc9c498b3317d79a9485c53ba127671de4 100755
--- a/iface/gspn/dcswave.test
+++ b/iface/gspn/dcswave.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/dcswaveeltl.test b/iface/gspn/dcswaveeltl.test
index d61ad56432631f6d97ff33149d0ced406b9f8698..11c3d4c5a7fa144979d2291c3b6c91589e618106 100755
--- a/iface/gspn/dcswaveeltl.test
+++ b/iface/gspn/dcswaveeltl.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/dcswavefm.test b/iface/gspn/dcswavefm.test
index d1bf9419ab20302bf0865a7623d480d10a7a838a..8677bdcc19d2df90acab8da21160e5db19bc2b39 100755
--- a/iface/gspn/dcswavefm.test
+++ b/iface/gspn/dcswavefm.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/dcswaveltl.test b/iface/gspn/dcswaveltl.test
index 97f5ab912ae3d707077d05ca7ee88cd20066e285..a93d3813b907cdb1136ab0888924012b938d33c5 100755
--- a/iface/gspn/dcswaveltl.test
+++ b/iface/gspn/dcswaveltl.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/dottygspn.cc b/iface/gspn/dottygspn.cc
index 32617a74e10a76695f2a6c5b07685dab2a498203..983d400b718f2f89242d773e456958edee7e3e60 100644
--- a/iface/gspn/dottygspn.cc
+++ b/iface/gspn/dottygspn.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "gspn.hh"
 #include "tgbaalgos/dotty.hh"
diff --git a/iface/gspn/dottyssp.cc b/iface/gspn/dottyssp.cc
index dda7c0e124e896420ce477c4532c34a7b6ed0943..2a6277cbac21469afc60c07fb3904071c8d52f19 100644
--- a/iface/gspn/dottyssp.cc
+++ b/iface/gspn/dottyssp.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ssp.hh"
 #include "tgbaalgos/dotty.hh"
diff --git a/iface/gspn/gspn.cc b/iface/gspn/gspn.cc
index 85c12652e187d0418b52658e3f5c8f8b84ae6007..6ff1089bebd85c56a16800619a58052437a8fa80 100644
--- a/iface/gspn/gspn.cc
+++ b/iface/gspn/gspn.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <map>
 #include <cassert>
diff --git a/iface/gspn/gspn.hh b/iface/gspn/gspn.hh
index cdc912b47e5819ac73c574e222bd4ea6e38e36d3..76754d97e29209602ea5ac7932866d223a12410a 100644
--- a/iface/gspn/gspn.hh
+++ b/iface/gspn/gspn.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_IFACE_GSPN_GSPN_HH
 # define SPOT_IFACE_GSPN_GSPN_HH
diff --git a/iface/gspn/ltlgspn.cc b/iface/gspn/ltlgspn.cc
index d36b97f6d52b51a387fee406441c561fa157cd9e..47c9bbdbf282e0b79b428f3e9a11df2fca1fab44 100644
--- a/iface/gspn/ltlgspn.cc
+++ b/iface/gspn/ltlgspn.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SSP
 #include "gspn.hh"
diff --git a/iface/gspn/simple.test b/iface/gspn/simple.test
index 8b0682e72aace406220b257bee3bf9fcb2fc4f91..1c0b8363c9bb1dbeee6fe24a59fe6169ec2a9c32 100755
--- a/iface/gspn/simple.test
+++ b/iface/gspn/simple.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/ssp.cc b/iface/gspn/ssp.cc
index 5f90d9741a8d0d531a028df1835bf06ef040fbfa..7c1ce87c1f38954fc80d5d5ae947f6cc228ef79b 100644
--- a/iface/gspn/ssp.cc
+++ b/iface/gspn/ssp.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstring>
 #include <map>
diff --git a/iface/gspn/ssp.hh b/iface/gspn/ssp.hh
index e1224c3b33948fb06a7900ef7fb2dfacc75f7c5e..93e9c68c8082831f41b6f8270670aedfb9e8b426 100644
--- a/iface/gspn/ssp.hh
+++ b/iface/gspn/ssp.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_IFACE_GSPN_SSP_HH
 # define SPOT_IFACE_GSPN_SSP_HH
diff --git a/iface/gspn/udcsefm.test b/iface/gspn/udcsefm.test
index 8d1bf4b5e03aa81b31eb471f4d58a79c530559e1..bb89150f2916b6a9f3fdb814bef36b89ba3b7c20 100755
--- a/iface/gspn/udcsefm.test
+++ b/iface/gspn/udcsefm.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/udcseltl.test b/iface/gspn/udcseltl.test
index f0947dcaa1ccc674b5950f5b6495086460893b50..46ee000e66410d70f1055feb3965cbedabed334b 100755
--- a/iface/gspn/udcseltl.test
+++ b/iface/gspn/udcseltl.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/udcsfm.test b/iface/gspn/udcsfm.test
index c4cfbce518cf0500e0724cb1e609fbcf54cd9ece..8610e1062550604f25021b53e09aacd3f5d2161d 100755
--- a/iface/gspn/udcsfm.test
+++ b/iface/gspn/udcsfm.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/iface/gspn/udcsltl.test b/iface/gspn/udcsltl.test
index a394b4fa58695b11fe637b3c12f3ca74561fd4fc..886d2349d99f495722bd20131ba061d5ec184d17 100755
--- a/iface/gspn/udcsltl.test
+++ b/iface/gspn/udcsltl.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 50c0207d71ac3c28b6eedb396f5508b5c4d5a416..ad6daf0429df385fb7f608769d9cd5dfc1ac7e18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AUTOMAKE_OPTIONS = subdir-objects
 
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 00951add5b3f76ebd2e80801675d9dc8fa78d656..f565bdad09f0fea0c6e8b414f11ae8ecf4da9ef8 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -6,7 +6,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = . man
 
diff --git a/src/bin/common_cout.cc b/src/bin/common_cout.cc
index 71cbd5ad29f9eb2d08e5d08d24f2a3cd158acf64..887ea8f5c6eb290e7117c66b0736f2506244ada3 100644
--- a/src/bin/common_cout.cc
+++ b/src/bin/common_cout.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 #include "common_cout.hh"
diff --git a/src/bin/common_cout.hh b/src/bin/common_cout.hh
index 0403f001a1c4e77db50da6afe1451dc5fe8478a5..e1191990040f31100b9fdcfb7d1df26fb382d205 100644
--- a/src/bin/common_cout.hh
+++ b/src/bin/common_cout.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_COUT_HH
 #define SPOT_BIN_COMMON_COUT_HH
diff --git a/src/bin/common_finput.cc b/src/bin/common_finput.cc
index 380b5927f693d8d42b0f319e0b15486f3688250f..baa42143b5d24bc95e1124ed9bbbf18727d7ae52 100644
--- a/src/bin/common_finput.cc
+++ b/src/bin/common_finput.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_finput.hh"
 #include "error.h"
diff --git a/src/bin/common_finput.hh b/src/bin/common_finput.hh
index 9c01c349bba15c493c025da1f9f73ff2be33f3c4..397bbf2d9e67e58d2ab0b39f96b6e3f32d48d217 100644
--- a/src/bin/common_finput.hh
+++ b/src/bin/common_finput.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_FINPUT_HH
 #define SPOT_BIN_COMMON_FINPUT_HH
diff --git a/src/bin/common_output.cc b/src/bin/common_output.cc
index f9f9ae19ab4bdddc7656c9f411498afa43b81c76..54f96c1f8daae31e9551b9595a75c5fac8e87157 100644
--- a/src/bin/common_output.cc
+++ b/src/bin/common_output.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 #include "common_output.hh"
diff --git a/src/bin/common_output.hh b/src/bin/common_output.hh
index def713b6c8b156813b44edb9051d8fe59fca8d84..2209f952c28ed1b2956f4debb1b20a046bebe635 100644
--- a/src/bin/common_output.hh
+++ b/src/bin/common_output.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_OUTPUT_HH
 #define SPOT_BIN_COMMON_OUTPUT_HH
diff --git a/src/bin/common_post.cc b/src/bin/common_post.cc
index 5f8cb2ff3803ca2460b8a9c998741f37cdbed007..83021535e206aee54befd8a6c7a662d9d94b5177 100644
--- a/src/bin/common_post.cc
+++ b/src/bin/common_post.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_post.hh"
 #include "common_r.hh"
diff --git a/src/bin/common_post.hh b/src/bin/common_post.hh
index 772021002705c84f3bd8f0299b57426107b390d0..b689982396cf178a41f89bb5929316da1976a872 100644
--- a/src/bin/common_post.hh
+++ b/src/bin/common_post.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_POST_HH
 #define SPOT_BIN_COMMON_POST_HH
diff --git a/src/bin/common_r.cc b/src/bin/common_r.cc
index e6468728e27aaccc3407cd1c0dea8978ce659523..a204f2d7424f59a4aabf1ab1d5eb6aeee41bca47 100644
--- a/src/bin/common_r.cc
+++ b/src/bin/common_r.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 #include "error.h"
diff --git a/src/bin/common_r.hh b/src/bin/common_r.hh
index dc301154c4d8061cac1a337dc3d32637c15e531f..f8cf6cfecf8037a7f6d45076451638c53f174119 100644
--- a/src/bin/common_r.hh
+++ b/src/bin/common_r.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_R_HH
 #define SPOT_BIN_COMMON_R_HH
diff --git a/src/bin/common_range.cc b/src/bin/common_range.cc
index fc5efa6488742af0c9b59a63ee025129a364303e..761e48a0a464bd88a971599c54048642d32ee14d 100644
--- a/src/bin/common_range.cc
+++ b/src/bin/common_range.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 #include "error.h"
diff --git a/src/bin/common_range.hh b/src/bin/common_range.hh
index e3d1ea0412caad0778655685973e0868fa8027a8..be38d0a8833fddd1ccbbeeee58695fcacf2ae0a4 100644
--- a/src/bin/common_range.hh
+++ b/src/bin/common_range.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_RANGE_HH
 #define SPOT_BIN_COMMON_RANGE_HH
diff --git a/src/bin/common_setup.cc b/src/bin/common_setup.cc
index 04a3a2d5fe3e309987c1dbbe5ced4c9fee8d76c6..5004aaed2fb39a9c8b1fce99edb60c33bae1ccc7 100644
--- a/src/bin/common_setup.cc
+++ b/src/bin/common_setup.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_setup.hh"
 #include "argp.h"
diff --git a/src/bin/common_setup.hh b/src/bin/common_setup.hh
index 17989d6a686ca6f0b8fb3a594cb464e86387f99f..3d0613803aaa344a71eaef3a9dc4ab09b31e3622 100644
--- a/src/bin/common_setup.hh
+++ b/src/bin/common_setup.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_SETUP_HH
 #define SPOT_BIN_COMMON_SETUP_HH
diff --git a/src/bin/common_sys.hh b/src/bin/common_sys.hh
index b7c9a5785404101d9042fd68c5b5c8ccf482b44b..98579836c9089b36f7f5648a7830a79606b53085 100644
--- a/src/bin/common_sys.hh
+++ b/src/bin/common_sys.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_BIN_COMMON_SYS_HH
 #define SPOT_BIN_COMMON_SYS_HH
diff --git a/src/bin/genltl.cc b/src/bin/genltl.cc
index acbbde7c6481f760786402b493c8391f0c55f039..bf456e42533b3d30ffb785b9f1f5bf2320f57a43 100644
--- a/src/bin/genltl.cc
+++ b/src/bin/genltl.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Families defined here come from the following papers:
 //
diff --git a/src/bin/ltl2tgba.cc b/src/bin/ltl2tgba.cc
index 72d6b45f16822b951bdb4fbdcacd1c854771a1fc..dd8e2155e7514031718f5b76ef347b1444a90575 100644
--- a/src/bin/ltl2tgba.cc
+++ b/src/bin/ltl2tgba.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 
diff --git a/src/bin/ltl2tgta.cc b/src/bin/ltl2tgta.cc
index 21bc185907b24877392dd6f03e733883f7fa44e5..b908cc0340cd2186b4663530c28da22776fe54a3 100644
--- a/src/bin/ltl2tgta.cc
+++ b/src/bin/ltl2tgta.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 
diff --git a/src/bin/ltlfilt.cc b/src/bin/ltlfilt.cc
index b8244304aec65906aa69e2c7058b054df36d3bda..0f2cfc04fe23a2939febdefaaa06005b34893a2e 100644
--- a/src/bin/ltlfilt.cc
+++ b/src/bin/ltlfilt.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 
diff --git a/src/bin/man/Makefile.am b/src/bin/man/Makefile.am
index 31aa70433165947ad8d9b5fd6a57a53c8becc1fd..72bb7b905e0bb472b468f71702b2fb7db9dd5e0e 100644
--- a/src/bin/man/Makefile.am
+++ b/src/bin/man/Makefile.am
@@ -6,7 +6,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 common_dep = $(top_builddir)/configure.ac
 x_to_1 = $(top_builddir)/tools/x-to-1
diff --git a/src/bin/randltl.cc b/src/bin/randltl.cc
index c906a44dd9e5bc446aaaf411c4fb174980e00c2f..46a214bdc525da5f35c73e19fd632eb22cfecf66 100644
--- a/src/bin/randltl.cc
+++ b/src/bin/randltl.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "common_sys.hh"
 
diff --git a/src/eltlparse/Makefile.am b/src/eltlparse/Makefile.am
index 1ae6add7b6306b495a86a03396d7d82feba32726..fbd15b1ef341af76a77e345c9f3d45b7e3ecd68f 100644
--- a/src/eltlparse/Makefile.am
+++ b/src/eltlparse/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. -DYY_NO_INPUT
 # Disable -Werror because too many versions of flex yield warnings.
diff --git a/src/eltlparse/eltlparse.yy b/src/eltlparse/eltlparse.yy
index d28f09bf5c758ce959a25d17cc900ff490561767..98b61dfca652ffa9d71f52d117690813e9285ddf 100644
--- a/src/eltlparse/eltlparse.yy
+++ b/src/eltlparse/eltlparse.yy
@@ -5,7 +5,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %language "C++"
 %locations
diff --git a/src/eltlparse/eltlscan.ll b/src/eltlparse/eltlscan.ll
index c40fe9352969238bb61ad3ed14a7a2c823a78cba..408af9f9e69d650588d8723289d5dad728cee597 100644
--- a/src/eltlparse/eltlscan.ll
+++ b/src/eltlparse/eltlscan.ll
@@ -5,7 +5,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %option noyywrap
 %option prefix="eltlyy"
diff --git a/src/eltlparse/fmterror.cc b/src/eltlparse/fmterror.cc
index 763c3798dc15f2648e2ceda1ffec018422f6756e..814b8db5ad4e9de184a709fc018d6373a4be531c 100644
--- a/src/eltlparse/fmterror.cc
+++ b/src/eltlparse/fmterror.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "public.hh"
diff --git a/src/eltlparse/parsedecl.hh b/src/eltlparse/parsedecl.hh
index db651953ce5a8f3dc2c8c6fa09c26e04454072e9..a0d066d2645a83d93094539dd07f0ce59f25bfd3 100644
--- a/src/eltlparse/parsedecl.hh
+++ b/src/eltlparse/parsedecl.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_ELTLPARSE_PARSEDECL_HH
 # define SPOT_ELTLPARSE_PARSEDECL_HH
diff --git a/src/eltlparse/public.hh b/src/eltlparse/public.hh
index bd2ae874da5737a357f3d89dfb8e3b35fdb0ac9d..7852ac5d2f4b33e593e22dcb93c3df0f73b1396b 100644
--- a/src/eltlparse/public.hh
+++ b/src/eltlparse/public.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_ELTLPARSE_PUBLIC_HH
 # define SPOT_ELTLPARSE_PUBLIC_HH
diff --git a/src/eltltest/Makefile.am b/src/eltltest/Makefile.am
index 076becc795ea729353afb9be94f5c41d70bf0c4c..f6f6ab94ae908aedee671429ae97ff96be34dc64 100644
--- a/src/eltltest/Makefile.am
+++ b/src/eltltest/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/eltltest/acc.cc b/src/eltltest/acc.cc
index 68775aa6cea6d478a5ec9ef4c1a9f0e2366fcb0a..d27677b8026524002f69201f21599be53a30a563 100644
--- a/src/eltltest/acc.cc
+++ b/src/eltltest/acc.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/eltltest/acc.test b/src/eltltest/acc.test
index 491e3815f89fa46a2fa5f2dc1789030d3995845f..a908309204f53beabb1d31f74cb80561ca7f47c2 100755
--- a/src/eltltest/acc.test
+++ b/src/eltltest/acc.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/src/eltltest/defs.in b/src/eltltest/defs.in
index e95071c67d7393ef6459ca303540c3f1afa0b557..6a05d842e5ce482cf80ec872922f08e170a26828 100644
--- a/src/eltltest/defs.in
+++ b/src/eltltest/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/src/eltltest/nfa.cc b/src/eltltest/nfa.cc
index 7debc3c5cedc2e5ac618c2e069563631d208323b..b49cdec7565f957f34cf014c413493217c1e5945 100644
--- a/src/eltltest/nfa.cc
+++ b/src/eltltest/nfa.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <string>
 #include <set>
diff --git a/src/eltltest/nfa.test b/src/eltltest/nfa.test
index 30187fa0730ec58e61ea5f0557c087af9260b1a3..71403cad86617b3205e3dc0cb920e163e871aea8 100755
--- a/src/eltltest/nfa.test
+++ b/src/eltltest/nfa.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit 1
 
diff --git a/src/evtgba/Makefile.am b/src/evtgba/Makefile.am
index a0087bffee3ed4404b6b5bce2b9e1f12b10a3a0d..9c509c2b5bbe6f4c4f2209a9aabfe66e942a38f5 100644
--- a/src/evtgba/Makefile.am
+++ b/src/evtgba/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/evtgba/evtgba.cc b/src/evtgba/evtgba.cc
index 556a03206f5bd933baadcab20ce5c072420edbe9..c91bc6a1460e46c4e7f0df5c9cac41107cc42dd8 100644
--- a/src/evtgba/evtgba.cc
+++ b/src/evtgba/evtgba.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include "evtgba.hh"
diff --git a/src/evtgba/evtgba.hh b/src/evtgba/evtgba.hh
index ec8d9ec5537bd67947eee7a2d6afffb617dba224..c56ed9c1d40af9ddf18316f85814bb06a1237a7e 100644
--- a/src/evtgba/evtgba.hh
+++ b/src/evtgba/evtgba.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBA_EVTGBA_HH
 # define SPOT_EVTGBA_EVTGBA_HH
diff --git a/src/evtgba/evtgbaiter.hh b/src/evtgba/evtgbaiter.hh
index 7957fc1bc5edb25f97a0b82631faa2dd8ba9ab56..6b4a5667fa4bae12af1ff7c74fe1a476f7379a04 100644
--- a/src/evtgba/evtgbaiter.hh
+++ b/src/evtgba/evtgbaiter.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBA_EVTGBAITER_HH
 # define SPOT_EVTGBA_EVTGBAITER_HH
diff --git a/src/evtgba/explicit.cc b/src/evtgba/explicit.cc
index ac4da8c48d02015d1699e09aa179de2101e12929..7b6b03c7d5fa4c53a215cc6c9a7a021cdf866fd3 100644
--- a/src/evtgba/explicit.cc
+++ b/src/evtgba/explicit.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "explicit.hh"
 #include "misc/bareword.hh"
diff --git a/src/evtgba/explicit.hh b/src/evtgba/explicit.hh
index d16e3a24c6cf94efda59709f4da49afb27578b36..913bb411ff049effd050e4e08f05ead1650fb9ce 100644
--- a/src/evtgba/explicit.hh
+++ b/src/evtgba/explicit.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBA_EXPLICIT_HH
 # define SPOT_EVTGBA_EXPLICIT_HH
diff --git a/src/evtgba/product.cc b/src/evtgba/product.cc
index f9d2ce0738f507f41b2ed31191d316918db7cea4..c69239dea1f5fb3e300fb35e6f0c95cf62f5f7ae 100644
--- a/src/evtgba/product.cc
+++ b/src/evtgba/product.cc
@@ -10,7 +10,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "product.hh"
 #include "misc/hashfunc.hh"
diff --git a/src/evtgba/product.hh b/src/evtgba/product.hh
index dbf845f688f7438dfc3d0a5b8defe02b50d8c000..188191e37b0c1e357e5a498a7474d8caa2b9083e 100644
--- a/src/evtgba/product.hh
+++ b/src/evtgba/product.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBA_PRODUCT_HH
 # define SPOT_EVTGBA_PRODUCT_HH
diff --git a/src/evtgba/symbol.cc b/src/evtgba/symbol.cc
index 2c1231f216f22e3ee2cee11757cbd05597dc7b87..b58a1e607902a8e3e75fc887ecb05f94ab0c7adc 100644
--- a/src/evtgba/symbol.cc
+++ b/src/evtgba/symbol.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "symbol.hh"
diff --git a/src/evtgba/symbol.hh b/src/evtgba/symbol.hh
index 34ff78f20d9edb934da80c096f225b5329328e02..7855e51387c3c8a0cf49d5b2a724533764d9e726 100644
--- a/src/evtgba/symbol.hh
+++ b/src/evtgba/symbol.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBA_SYMBOL_HH
 # define SPOT_EVTGBA_SYMBOL_HH
diff --git a/src/evtgbaalgos/Makefile.am b/src/evtgbaalgos/Makefile.am
index d134d125f190b9176c630783628bc075ff43009f..17a9befa4d593bd13c91ab97beadc969e94bf9d1 100644
--- a/src/evtgbaalgos/Makefile.am
+++ b/src/evtgbaalgos/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/evtgbaalgos/dotty.cc b/src/evtgbaalgos/dotty.cc
index bba60ecf445b2e54ea28763c88f94a96e9dec9df..eae1e7f922efeb578f289cce6d7928da5d40854e 100644
--- a/src/evtgbaalgos/dotty.cc
+++ b/src/evtgbaalgos/dotty.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "evtgba/evtgba.hh"
diff --git a/src/evtgbaalgos/dotty.hh b/src/evtgbaalgos/dotty.hh
index 8b7186f36d6f2fa5632b8bab12264eacf7c55b83..11438403c62ccf1e93640f63eb60afbee16376f7 100644
--- a/src/evtgbaalgos/dotty.hh
+++ b/src/evtgbaalgos/dotty.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBAALGOS_DOTTY_HH
 # define SPOT_EVTGBAALGOS_DOTTY_HH
diff --git a/src/evtgbaalgos/reachiter.cc b/src/evtgbaalgos/reachiter.cc
index a7065be97dac726849e465927ef79dadf6072df5..692d38f1050abaa9eaee330c6058cb619aa69c8d 100644
--- a/src/evtgbaalgos/reachiter.cc
+++ b/src/evtgbaalgos/reachiter.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "reachiter.hh"
diff --git a/src/evtgbaalgos/reachiter.hh b/src/evtgbaalgos/reachiter.hh
index dadb4a7d47fcd86fbc2f732c7468a8a2d892bf85..5c8e8343ee42e7950be018f9d6fa5c1a1fbb4b48 100644
--- a/src/evtgbaalgos/reachiter.hh
+++ b/src/evtgbaalgos/reachiter.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBAALGOS_REACHITER_HH
 # define SPOT_EVTGBAALGOS_REACHITER_HH
diff --git a/src/evtgbaalgos/save.cc b/src/evtgbaalgos/save.cc
index 3bb82db8aa2ff3884f2bd8573add8adc8e8519ae..8c738853cd0bbf9853fbb4ab7fa729e623134cac 100644
--- a/src/evtgbaalgos/save.cc
+++ b/src/evtgbaalgos/save.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "save.hh"
diff --git a/src/evtgbaalgos/save.hh b/src/evtgbaalgos/save.hh
index f24565f9ede910ea6b6052a3cfa60e57fc81e26b..fd498c2821fb4e80053b30b34c05b90c6bbb95a6 100644
--- a/src/evtgbaalgos/save.hh
+++ b/src/evtgbaalgos/save.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBAALGOS_SAVE_HH
 # define SPOT_EVTGBAALGOS_SAVE_HH
diff --git a/src/evtgbaalgos/tgba2evtgba.cc b/src/evtgbaalgos/tgba2evtgba.cc
index ca7030ab7de6e1a4fe93519734f363fd4f451de9..1c8c1771786480a61d751a974d52da32cd919049 100644
--- a/src/evtgbaalgos/tgba2evtgba.cc
+++ b/src/evtgbaalgos/tgba2evtgba.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgba2evtgba.hh"
 #include "tgba/tgba.hh"
diff --git a/src/evtgbaalgos/tgba2evtgba.hh b/src/evtgbaalgos/tgba2evtgba.hh
index a58117046e1c10ac19726868b770bbcd314080f7..195256c7bf29998f3b7d3f00db778d971615ef97 100644
--- a/src/evtgbaalgos/tgba2evtgba.hh
+++ b/src/evtgbaalgos/tgba2evtgba.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBAALGOS_TGBA2EVTGBA_HH
 # define SPOT_EVTGBAALGOS_TGBA2EVTGBA_HH
diff --git a/src/evtgbaparse/Makefile.am b/src/evtgbaparse/Makefile.am
index 8424315a5f001a1590fa2ce7d85c6dc63fd0c517..55934693bc8b5656b5505695f0f05bd2b55767a2 100644
--- a/src/evtgbaparse/Makefile.am
+++ b/src/evtgbaparse/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT
 # Disable -Werror because too many versions of flex yield warnings.
diff --git a/src/evtgbaparse/evtgbaparse.yy b/src/evtgbaparse/evtgbaparse.yy
index ed90a8fd8412899c16c592c5489085eda9861f1a..171e9d7ed9dfa94b45148835cfaa1c526827279c 100644
--- a/src/evtgbaparse/evtgbaparse.yy
+++ b/src/evtgbaparse/evtgbaparse.yy
@@ -8,7 +8,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %language "C++"
 %locations
diff --git a/src/evtgbaparse/evtgbascan.ll b/src/evtgbaparse/evtgbascan.ll
index c8f38d0cf47ec28212b49143a9a174dbd7f656d4..0029f0b3a8a3a9c61342ba3461aac961a040af98 100644
--- a/src/evtgbaparse/evtgbascan.ll
+++ b/src/evtgbaparse/evtgbascan.ll
@@ -8,7 +8,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %option noyywrap
 %option prefix="evtgbayy"
diff --git a/src/evtgbaparse/fmterror.cc b/src/evtgbaparse/fmterror.cc
index d6fda032d9662982ed8194230969b95ea6ac2900..ca84c0d1d50a713005706b823d26441b559f43ad 100644
--- a/src/evtgbaparse/fmterror.cc
+++ b/src/evtgbaparse/fmterror.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "public.hh"
diff --git a/src/evtgbaparse/parsedecl.hh b/src/evtgbaparse/parsedecl.hh
index 447fe1744d191f584a4c1ec22452ae7fa6af5281..deab799f94e525b9f1d91466430ffefb59fe18e0 100644
--- a/src/evtgbaparse/parsedecl.hh
+++ b/src/evtgbaparse/parsedecl.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBAPARSE_PARSEDECL_HH
 # define SPOT_EVTGBAPARSE_PARSEDECL_HH
diff --git a/src/evtgbaparse/public.hh b/src/evtgbaparse/public.hh
index 8893b3eb33101d318abb400d1093e59d4698c1c0..89f304764bf6934ba7a0244b294f84b307b65334 100644
--- a/src/evtgbaparse/public.hh
+++ b/src/evtgbaparse/public.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_EVTGBAPARSE_PUBLIC_HH
 # define SPOT_EVTGBAPARSE_PUBLIC_HH
diff --git a/src/evtgbatest/Makefile.am b/src/evtgbatest/Makefile.am
index ab2e7b7f9940a9f6dae8a20df7be54ce32563504..a44d64e83609fee0c34dbb38c8cd7fc0fdcb0e36 100644
--- a/src/evtgbatest/Makefile.am
+++ b/src/evtgbatest/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/evtgbatest/defs.in b/src/evtgbatest/defs.in
index 79f56261bb6f6b0007d3857702b215e6bfd11358..ee215e8c960df983f59451220294027bde0ed184 100644
--- a/src/evtgbatest/defs.in
+++ b/src/evtgbatest/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/src/evtgbatest/explicit.cc b/src/evtgbatest/explicit.cc
index 27e045a4f7c422e77ae4ec517d1261dc76859ff3..261646c856f5f8fe4a3c7458a944ecae77f988e9 100644
--- a/src/evtgbatest/explicit.cc
+++ b/src/evtgbatest/explicit.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/evtgbatest/explicit.test b/src/evtgbatest/explicit.test
index f9575a69d8b1641ae6cbd67f3de20fcfec52fb22..079b5701d7b2482d5b3141ac86826b00afbcea0b 100755
--- a/src/evtgbatest/explicit.test
+++ b/src/evtgbatest/explicit.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/evtgbatest/ltl2evtgba.cc b/src/evtgbatest/ltl2evtgba.cc
index 9391d72575a5162425d5468daf0c2ad9cc0efab0..cb3003a1942da9d2b3ad5d8267b18b0cef1b3399 100644
--- a/src/evtgbatest/ltl2evtgba.cc
+++ b/src/evtgbatest/ltl2evtgba.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/evtgbatest/ltl2evtgba.test b/src/evtgbatest/ltl2evtgba.test
index b03ddaccfa19ac1aae7f75b5575fc0763c2323c3..ac553d928d052965614f04397084ebc4cec046f4 100755
--- a/src/evtgbatest/ltl2evtgba.test
+++ b/src/evtgbatest/ltl2evtgba.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/evtgbatest/product.cc b/src/evtgbatest/product.cc
index 53b1746589a699516c71e0015f2a546b3d9de022..32c7e08bf62c69717d785fc86872f26237629248 100644
--- a/src/evtgbatest/product.cc
+++ b/src/evtgbatest/product.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/evtgbatest/product.test b/src/evtgbatest/product.test
index 62db642ecee9af792319eca100b514d96207da10..8e628fad642d7033f4d9ffabd6f5c3647c4e1b41 100755
--- a/src/evtgbatest/product.test
+++ b/src/evtgbatest/product.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/evtgbatest/readsave.cc b/src/evtgbatest/readsave.cc
index 65e0d6eb151857bebefa06dfcd8424b5b8327dab..08d3e30ae50c4219e29734289389570cfd989e17 100644
--- a/src/evtgbatest/readsave.cc
+++ b/src/evtgbatest/readsave.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/evtgbatest/readsave.test b/src/evtgbatest/readsave.test
index ef6e35d98acb9a3ddf432275d6318732aa29a79c..2278f56539c85794a8b25dfe5f08e6c57ee2ae3b 100755
--- a/src/evtgbatest/readsave.test
+++ b/src/evtgbatest/readsave.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/kripke/Makefile.am b/src/kripke/Makefile.am
index a5d693ed59a03384aa16f5ae05930201ee795e6c..05a9bd1f6f1589966e7f3c91468b151e9f436a7c 100644
--- a/src/kripke/Makefile.am
+++ b/src/kripke/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/kripke/fairkripke.cc b/src/kripke/fairkripke.cc
index fd5c7fadd88985899e16547d5a77969ca4e37e54..5f59b29f82965ed4feb239ba0e463e94d887fa13 100644
--- a/src/kripke/fairkripke.cc
+++ b/src/kripke/fairkripke.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "fairkripke.hh"
 
diff --git a/src/kripke/fairkripke.hh b/src/kripke/fairkripke.hh
index 36ae31a3ff42bb3742b9fa4f9cfbb5e6b89dcb7d..aca7b617405a19750cca1a6d956ada77fcee3160 100644
--- a/src/kripke/fairkripke.hh
+++ b/src/kripke/fairkripke.hh
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_KRIPKE_FAIRKRIPKE_HH
 # define SPOT_KRIPKE_FAIRKRIPKE_HH
diff --git a/src/kripke/kripke.cc b/src/kripke/kripke.cc
index 58854f22223ce2cb019416f85fb6993eefa0052f..0be0190315e3c92e93ec4672a906f4a372f5e3b6 100644
--- a/src/kripke/kripke.cc
+++ b/src/kripke/kripke.cc
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "kripke.hh"
 
diff --git a/src/kripke/kripke.hh b/src/kripke/kripke.hh
index 49c3ee605826b22cc7f40905f9054ea8c685d775..f5964a7b6512cd43fd730aeefefa4cd6f0ffc2d7 100644
--- a/src/kripke/kripke.hh
+++ b/src/kripke/kripke.hh
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_KRIPKE_KRIPKE_HH
 # define SPOT_KRIPKE_KRIPKE_HH
diff --git a/src/kripke/kripkeexplicit.cc b/src/kripke/kripkeexplicit.cc
index 8f620f77a02556ee73210e550ffb63c6322ff2b2..f6318c37e1d8370267601d2e7e26e4c15250925a 100644
--- a/src/kripke/kripkeexplicit.cc
+++ b/src/kripke/kripkeexplicit.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "kripkeexplicit.hh"
diff --git a/src/kripke/kripkeexplicit.hh b/src/kripke/kripkeexplicit.hh
index bc09beccde5e77e73f6e4b63a1ae6b752b4620df..420bd6248d592e3314e0ef5d625ce8f1c70606c7 100644
--- a/src/kripke/kripkeexplicit.hh
+++ b/src/kripke/kripkeexplicit.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_KRIPKE_KRIPKEEXPLICIT_HH
diff --git a/src/kripke/kripkeprint.cc b/src/kripke/kripkeprint.cc
index 54525f4211104469e9ef0298647fa7d72d81ffaf..5f04dde1e233c1ea54ab8385272813dde3029c36 100644
--- a/src/kripke/kripkeprint.cc
+++ b/src/kripke/kripkeprint.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "kripkeprint.hh"
diff --git a/src/kripke/kripkeprint.hh b/src/kripke/kripkeprint.hh
index eb6ad40f0380370ec928fb851e64f425ea31c917..2d63d62d516ed25bcffead70826e814f09f6edee 100644
--- a/src/kripke/kripkeprint.hh
+++ b/src/kripke/kripkeprint.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_KRIPKE_KRIPKEPRINT_HH
diff --git a/src/kripkeparse/Makefile.am b/src/kripkeparse/Makefile.am
index 7df816daaefcf5875b82f01b4ac9fbc10f24e83c..0dd2e2aae12f652e77c02e94b03f3e03e8bff4f0 100644
--- a/src/kripkeparse/Makefile.am
+++ b/src/kripkeparse/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT
 # Disable -Werror because too many versions of flex yield warnings.
diff --git a/src/kripkeparse/fmterror.cc b/src/kripkeparse/fmterror.cc
index 0ae5549bf179f3085d4db597085e3e5c66998e4f..5d8f7cc420cbc0c5a21cdee455c4f523fb69ff2f 100644
--- a/src/kripkeparse/fmterror.cc
+++ b/src/kripkeparse/fmterror.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "public.hh"
diff --git a/src/kripkeparse/kripkeparse.yy b/src/kripkeparse/kripkeparse.yy
index f6fb5b4d0557a8bbb1db0caf185f4dd5b7db2e3e..51f2bf26a4730a87762da52cb511dfb1a3f1f8e9 100644
--- a/src/kripkeparse/kripkeparse.yy
+++ b/src/kripkeparse/kripkeparse.yy
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 %language "C++"
 %locations
diff --git a/src/kripkeparse/kripkescan.ll b/src/kripkeparse/kripkescan.ll
index 93aa34ec99be1bc2f7e5a09d5205d6414ca982a2..37df81ae37a12854f4909ea732e8a161f061989d 100644
--- a/src/kripkeparse/kripkescan.ll
+++ b/src/kripkeparse/kripkescan.ll
@@ -5,7 +5,7 @@
 *
 * Spot is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
+* the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 * License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with Spot; see the file COPYING.  If not, write to the Free
-* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-* 02111-1307, USA.*/
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 %option noyywrap
 %option prefix="kripkeyy"
diff --git a/src/kripkeparse/parsedecl.hh b/src/kripkeparse/parsedecl.hh
index 9186307cc355701afa7dcc85713f5d99af9f2874..d018b15dacc9326a0518a418f91e568c247f423c 100644
--- a/src/kripkeparse/parsedecl.hh
+++ b/src/kripkeparse/parsedecl.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_KRIPKEPARSE_PARSEDECL_HH
diff --git a/src/kripkeparse/public.hh b/src/kripkeparse/public.hh
index 7cc9163b786b722ef3194ab7a885bb0598615960..f10fdcf072fdb09be523b457853393673ac5097b 100644
--- a/src/kripkeparse/public.hh
+++ b/src/kripkeparse/public.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_KRIPKEPARSE_PUBLIC_HH
diff --git a/src/kripkeparse/scankripke.ll b/src/kripkeparse/scankripke.ll
index a1e6e95a534f39aab3f785607c3a92e1fed1b3e8..a3b4a29838289cc2520e319b96e086a5ac2dd63c 100644
--- a/src/kripkeparse/scankripke.ll
+++ b/src/kripkeparse/scankripke.ll
@@ -6,7 +6,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %option noyywrap
  //%option prefix="tgbayy"
diff --git a/src/kripketest/Makefile.am b/src/kripketest/Makefile.am
index 3966021c579a5e30e3d40eebde6a10ec06b8948c..b384cdd87f3221f48fd241aca4d9522c3b3386f1 100644
--- a/src/kripketest/Makefile.am
+++ b/src/kripketest/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 
diff --git a/src/kripketest/bad_parsing.test b/src/kripketest/bad_parsing.test
index b617065922436080eea20c97e88a8e24c16e0574..ae5fdca7a79f1a7771e9769ffd13f8f4b4a9f453 100755
--- a/src/kripketest/bad_parsing.test
+++ b/src/kripketest/bad_parsing.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/kripketest/defs.in b/src/kripketest/defs.in
index 8e51e7c01117cfa7780abeb7a75942636675594c..cb272b871ab85aa85237b1312105399ea5b0edee 100644
--- a/src/kripketest/defs.in
+++ b/src/kripketest/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/src/kripketest/kripke.test b/src/kripketest/kripke.test
index a1a195111d0e1b46af906db94c2d97774837787b..17ac8a130ed3a11b9c6d1f4404ad11b24be1ace8 100755
--- a/src/kripketest/kripke.test
+++ b/src/kripketest/kripke.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/kripketest/parse_print_test.cc b/src/kripketest/parse_print_test.cc
index 2c6db871a1b50d22afe5c046fa92bed006313daa..4c31f03473c8f8b244b792f97cd073a5c52f8a6d 100644
--- a/src/kripketest/parse_print_test.cc
+++ b/src/kripketest/parse_print_test.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "kripkeparse/public.hh"
diff --git a/src/ltlast/Makefile.am b/src/ltlast/Makefile.am
index 990dc4f01ef453c8c19eef94c20f91d753ec97fb..8f3ebaa6dd8c9fad1b83f0f1cc24c4263de7fd1d 100644
--- a/src/ltlast/Makefile.am
+++ b/src/ltlast/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I..
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/ltlast/allnodes.hh b/src/ltlast/allnodes.hh
index e19d79060707bf4bb03d16abb867bd4f073622dc..4e71c262136dce7539e7e874c65decd5760cb6a7 100644
--- a/src/ltlast/allnodes.hh
+++ b/src/ltlast/allnodes.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/allnodes.hh
 /// \brief Define all LTL node types.
diff --git a/src/ltlast/atomic_prop.cc b/src/ltlast/atomic_prop.cc
index 13ee24a60e13dd7c352dd8d6434cb0f54d0c8a60..4db0aa8be616712aedfd31b302bd8d24867d691a 100644
--- a/src/ltlast/atomic_prop.cc
+++ b/src/ltlast/atomic_prop.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "atomic_prop.hh"
 #include "visitor.hh"
diff --git a/src/ltlast/atomic_prop.hh b/src/ltlast/atomic_prop.hh
index 963359be1267847009536623d8030e21175b2333..a9362828c1c830c11dd4728008138eb0afe45c97 100644
--- a/src/ltlast/atomic_prop.hh
+++ b/src/ltlast/atomic_prop.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/atomic_prop.hh
 /// \brief LTL atomic propositions
diff --git a/src/ltlast/automatop.cc b/src/ltlast/automatop.cc
index 8f9959bf93a927724f9f89047e372b2613093870..4a93d50ab6bedc4e03dbf7cedaab4b049ef7ae79 100644
--- a/src/ltlast/automatop.cc
+++ b/src/ltlast/automatop.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "automatop.hh"
diff --git a/src/ltlast/automatop.hh b/src/ltlast/automatop.hh
index 1ee820818b14212fb7ac968757c03e44512dd03d..31272de1416f25a4c04237ae54ea528f01c8f498 100644
--- a/src/ltlast/automatop.hh
+++ b/src/ltlast/automatop.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/automatop.hh
 /// \brief ELTL automaton operators
diff --git a/src/ltlast/binop.cc b/src/ltlast/binop.cc
index 23bd43e2e12da1ea4b151020cd9991e585b6ec50..fb39c7e9f3fb6339e36a5ddde45ae0c0cab9c99b 100644
--- a/src/ltlast/binop.cc
+++ b/src/ltlast/binop.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <utility>
diff --git a/src/ltlast/binop.hh b/src/ltlast/binop.hh
index d9af12d80f52701e1e411857d3619d8ce8a9404d..c069078b4f84dbe4aca30a65e40b781d0a9fd071 100644
--- a/src/ltlast/binop.hh
+++ b/src/ltlast/binop.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/binop.hh
 /// \brief LTL binary operators
diff --git a/src/ltlast/bunop.cc b/src/ltlast/bunop.cc
index 58689aadb13dfcd9fe1aea544cb420dabdf1b0c4..dbfb53155a694f90a9c4f43378d84c4c1500bb87 100644
--- a/src/ltlast/bunop.cc
+++ b/src/ltlast/bunop.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "bunop.hh"
 #include "visitor.hh"
diff --git a/src/ltlast/bunop.hh b/src/ltlast/bunop.hh
index e31e843ef9b6d66866e1ddd30cb8d8e216d10454..d645a719fdc564b0b22a20517c5c0f1f7164a85f 100644
--- a/src/ltlast/bunop.hh
+++ b/src/ltlast/bunop.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/bunop.hh
 /// \brief Bounded Unary operators
diff --git a/src/ltlast/constant.cc b/src/ltlast/constant.cc
index 4e316c3133a432d6d0647d24d2ddc68b24b74f17..829526dd3439be094ec490d35ef8ada3e71f8496 100644
--- a/src/ltlast/constant.cc
+++ b/src/ltlast/constant.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "constant.hh"
 #include "visitor.hh"
diff --git a/src/ltlast/constant.hh b/src/ltlast/constant.hh
index 62ad013b5730edfc48be5de149b691a65bf03cdb..55386ba3c2384c67146618fc0da33855b52b8aba 100644
--- a/src/ltlast/constant.hh
+++ b/src/ltlast/constant.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/constant.hh
 /// \brief LTL constants
diff --git a/src/ltlast/formula.cc b/src/ltlast/formula.cc
index 94086c51f649ab4927b0ad0fb3d4773008bb5d24..33421a9e3e8d6bd81fda693f0326b9aa7669641b 100644
--- a/src/ltlast/formula.cc
+++ b/src/ltlast/formula.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "formula.hh"
 #include "misc/hash.hh"
diff --git a/src/ltlast/formula.hh b/src/ltlast/formula.hh
index 85f44e1994085f59baf6cea762752c647b998572..ec6b0bf45082acfd8b6b2330c02bfd27891456a2 100644
--- a/src/ltlast/formula.hh
+++ b/src/ltlast/formula.hh
@@ -7,7 +7,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/formula.hh
 /// \brief LTL formula interface
diff --git a/src/ltlast/formula_tree.cc b/src/ltlast/formula_tree.cc
index cfdcfe528d28a45c8a56bf2dc320a96ec6c4105c..71290bbcf13bc37e5af95a1aa0837718980223af 100644
--- a/src/ltlast/formula_tree.cc
+++ b/src/ltlast/formula_tree.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "formula_tree.hh"
diff --git a/src/ltlast/formula_tree.hh b/src/ltlast/formula_tree.hh
index e2ff61a2b7901f363bc2e4ba610e382c8fca1630..c70daa44cf17d5479d010761748ff77296ec09de 100644
--- a/src/ltlast/formula_tree.hh
+++ b/src/ltlast/formula_tree.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/formula_tree.hh
 /// \brief Trees representing formulae where atomic propositions are unknown
diff --git a/src/ltlast/multop.cc b/src/ltlast/multop.cc
index 52495d55989e25cdccba15b7e8e51e23bcb52f6c..bb1b459f4b934ad9812b21cfe26620840e7a89b1 100644
--- a/src/ltlast/multop.cc
+++ b/src/ltlast/multop.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <utility>
diff --git a/src/ltlast/multop.hh b/src/ltlast/multop.hh
index 268de7a230158ac4775c36ac04c2371bc3cd193e..a8f072024c3513da12ddcbac99f4452a4f18ca6b 100644
--- a/src/ltlast/multop.hh
+++ b/src/ltlast/multop.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/multop.hh
 /// \brief LTL multi-operand operators
diff --git a/src/ltlast/nfa.cc b/src/ltlast/nfa.cc
index 816c66872a6e4a013c8b6487c6b1c87d207b4d13..95957c2fa63ba5d5b1c7b7ca85423c0209810694 100644
--- a/src/ltlast/nfa.cc
+++ b/src/ltlast/nfa.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "nfa.hh"
diff --git a/src/ltlast/nfa.hh b/src/ltlast/nfa.hh
index 6dc52c8a5e90c6c970813302e549fda06734744d..abc58df61301e8fef6b451afaf83810e305e48ad 100644
--- a/src/ltlast/nfa.hh
+++ b/src/ltlast/nfa.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/nfa.hh
 /// \brief NFA interface used by automatop
diff --git a/src/ltlast/predecl.hh b/src/ltlast/predecl.hh
index d722897ce7e97b54b0632b42cfd8f0dc3f1ed366..1f746fffe9b61f31f686c55e2fdaaad01937ed8c 100644
--- a/src/ltlast/predecl.hh
+++ b/src/ltlast/predecl.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/predecl.hh
 /// \brief Predeclare all LTL node types.
diff --git a/src/ltlast/refformula.cc b/src/ltlast/refformula.cc
index 9a4dec1d90b51437772c1fe10e786dc9be95a775..cf94173ea0df20a1c75c857e44d7d47cb007bb3a 100644
--- a/src/ltlast/refformula.cc
+++ b/src/ltlast/refformula.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "refformula.hh"
 #include <cassert>
diff --git a/src/ltlast/refformula.hh b/src/ltlast/refformula.hh
index 2db5d46c8e69f6e50a8e5f4723b93f1bf621103b..eedc8a5f3689fda4416cd33f89706551c951cf17 100644
--- a/src/ltlast/refformula.hh
+++ b/src/ltlast/refformula.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/refformula.hh
 /// \brief Reference-counted LTL formulae
diff --git a/src/ltlast/unop.cc b/src/ltlast/unop.cc
index ab71b172ede6415a31095a58c8745918b521ab8a..72053a4f1dc45a91b4897abcd8bc54aa50b291ae 100644
--- a/src/ltlast/unop.cc
+++ b/src/ltlast/unop.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "unop.hh"
 #include "visitor.hh"
diff --git a/src/ltlast/unop.hh b/src/ltlast/unop.hh
index 09ab6bc8ff6fad284b94ee5ff266fb7c36f56d62..77b90a663534391418ba89ae805ff2e768d9ddc2 100644
--- a/src/ltlast/unop.hh
+++ b/src/ltlast/unop.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/unop.hh
 /// \brief LTL unary operators
diff --git a/src/ltlast/visitor.hh b/src/ltlast/visitor.hh
index 4dd2b46dc875308cc5b79778cd2c35750d9f6d2c..5bbb40ecd33d9224162adc58951b560126de4acb 100644
--- a/src/ltlast/visitor.hh
+++ b/src/ltlast/visitor.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// \file ltlast/visitor.hh
 /// \brief LTL visitor interface
diff --git a/src/ltlenv/Makefile.am b/src/ltlenv/Makefile.am
index c3dbf107ffc88e330ff822f4eb6027d1084980ee..99e9570d4c903cc682b60b35e90d97b733c0e916 100644
--- a/src/ltlenv/Makefile.am
+++ b/src/ltlenv/Makefile.am
@@ -6,7 +6,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/..
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/ltlenv/declenv.cc b/src/ltlenv/declenv.cc
index b10eb8cd3a5d16feb74890ce042627ebe0b42f3b..20c32d14ee530e829d27303018beadcabc716ebe 100644
--- a/src/ltlenv/declenv.cc
+++ b/src/ltlenv/declenv.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "declenv.hh"
 
diff --git a/src/ltlenv/declenv.hh b/src/ltlenv/declenv.hh
index cebcea0df9f254dd5ac857973e72ccea4122e084..2a73bf29f13b72a96a31bfdc7a1976f18310d2b2 100644
--- a/src/ltlenv/declenv.hh
+++ b/src/ltlenv/declenv.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLENV_DECLENV_HH
 # define SPOT_LTLENV_DECLENV_HH
diff --git a/src/ltlenv/defaultenv.cc b/src/ltlenv/defaultenv.cc
index 8cadd240141823e39aaa524f55009db4f7d0c216..32b7cb14ec903dd383a03401428e5bda5c40b530 100644
--- a/src/ltlenv/defaultenv.cc
+++ b/src/ltlenv/defaultenv.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/atomic_prop.hh"
 #include "defaultenv.hh"
diff --git a/src/ltlenv/defaultenv.hh b/src/ltlenv/defaultenv.hh
index 51d70e612c22f0147ff378e6c380540fb20079ad..64ac68cbf6aa0b941749a2c84ea2311cad748aa4 100644
--- a/src/ltlenv/defaultenv.hh
+++ b/src/ltlenv/defaultenv.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLENV_DEFAULTENV_HH
 # define SPOT_LTLENV_DEFAULTENV_HH
diff --git a/src/ltlenv/environment.hh b/src/ltlenv/environment.hh
index 02439ee935124fada06ee71243529e193ef83917..5a2d5c153db2ee5910af8982ca3d385edb125ecd 100644
--- a/src/ltlenv/environment.hh
+++ b/src/ltlenv/environment.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLENV_ENVIRONMENT_HH
 # define SPOT_LTLENV_ENVIRONMENT_HH
diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am
index 90ff5b5ce9ee1872c99feef13cb85a156e92053c..ff4f515886390fa69b0614395b0f1781d473852d 100644
--- a/src/ltlparse/Makefile.am
+++ b/src/ltlparse/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir)/.. -I.. -DYY_NO_INPUT
 # Disable -Werror because too many versions of flex yield warnings.
diff --git a/src/ltlparse/fmterror.cc b/src/ltlparse/fmterror.cc
index 598ac956a08a070bd0c000a5efcfa3e26b88e558..b0864319f5153fe398ccbb491cee63d7ca68cf50 100644
--- a/src/ltlparse/fmterror.cc
+++ b/src/ltlparse/fmterror.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "public.hh"
 #include <ostream>
diff --git a/src/ltlparse/ltlfile.cc b/src/ltlparse/ltlfile.cc
index 80ada6cc8bf0cf70cc3c40215c181441bb8db184..5bff764262bddab05ab462bda31eeb7c9ba53c17 100644
--- a/src/ltlparse/ltlfile.cc
+++ b/src/ltlparse/ltlfile.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlfile.hh"
 #include "public.hh"
diff --git a/src/ltlparse/ltlfile.hh b/src/ltlparse/ltlfile.hh
index c20defd1fde5cd755faa041bfb8c25ab49434da3..b0035d734875f60377af1a81008cdebe38dfbed6 100644
--- a/src/ltlparse/ltlfile.hh
+++ b/src/ltlparse/ltlfile.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLPARSE_LTLFILE_HH
 # define SPOT_LTLPARSE_LTLFILE_HH
diff --git a/src/ltlparse/ltlparse.yy b/src/ltlparse/ltlparse.yy
index a5136552f371a4d58eae84260fc63ab844724855..986f10eedbc9ec7a11e73e1bcd2561b744505a14 100644
--- a/src/ltlparse/ltlparse.yy
+++ b/src/ltlparse/ltlparse.yy
@@ -8,7 +8,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %language "C++"
 %locations
diff --git a/src/ltlparse/ltlscan.ll b/src/ltlparse/ltlscan.ll
index 84f1b211c77be8a949bd855dd0f55bc4dfa2ed22..3d46450a714a37b62a9fe6a64653b2bfd31a64f3 100644
--- a/src/ltlparse/ltlscan.ll
+++ b/src/ltlparse/ltlscan.ll
@@ -8,7 +8,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %option noyywrap warn 8bit batch
 %option prefix="ltlyy"
diff --git a/src/ltlparse/parsedecl.hh b/src/ltlparse/parsedecl.hh
index b54b8bb5d1f16d2e3a930c82a9adee1b4cba6451..db425765dafc6a0a502116d14f082ebcaa1e2fb5 100644
--- a/src/ltlparse/parsedecl.hh
+++ b/src/ltlparse/parsedecl.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLPARSE_PARSEDECL_HH
 # define SPOT_LTLPARSE_PARSEDECL_HH
diff --git a/src/ltlparse/public.hh b/src/ltlparse/public.hh
index bf75480e8f681e6b14273eafcf4d22a4fec3d48e..09607b49246ad8a3d99a898453e2e4742cf5eb5d 100644
--- a/src/ltlparse/public.hh
+++ b/src/ltlparse/public.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLPARSE_PUBLIC_HH
 # define SPOT_LTLPARSE_PUBLIC_HH
diff --git a/src/ltltest/Makefile.am b/src/ltltest/Makefile.am
index 6cefb7b49dbda49c7e55511192517a0e9f200fc9..af685fc1235bc070e44de801bb2957bf7f3d38e4 100644
--- a/src/ltltest/Makefile.am
+++ b/src/ltltest/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/ltltest/consterm.cc b/src/ltltest/consterm.cc
index 15fa1c9eab21876f423083c08f6631caf155f0fa..53ab452867b640563789130e2be35fa8f6e1f213 100644
--- a/src/ltltest/consterm.cc
+++ b/src/ltltest/consterm.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/consterm.test b/src/ltltest/consterm.test
index cd4dc54c9350459c42508da1f0a91b67603aa907..13bbf7360be1ba99826758f4196d0bd58e5658e0 100755
--- a/src/ltltest/consterm.test
+++ b/src/ltltest/consterm.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the constant_term visitor
diff --git a/src/ltltest/defs.in b/src/ltltest/defs.in
index e95071c67d7393ef6459ca303540c3f1afa0b557..6a05d842e5ce482cf80ec872922f08e170a26828 100644
--- a/src/ltltest/defs.in
+++ b/src/ltltest/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/src/ltltest/equals.cc b/src/ltltest/equals.cc
index 89a74f5413a3784d5bb7f5fd53a64c03f973b366..bc1090a660b99bdc53d947ac1e9d7f66a16aab99 100644
--- a/src/ltltest/equals.cc
+++ b/src/ltltest/equals.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/equals.test b/src/ltltest/equals.test
index 38e6633009424cbe8a5e74b212b383afdda39a16..3760fe867fd55ef6bdb7020dd5803c5b83fafe1f 100755
--- a/src/ltltest/equals.test
+++ b/src/ltltest/equals.test
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the equals visitor
diff --git a/src/ltltest/kind.cc b/src/ltltest/kind.cc
index cb14ecb93a7ea24f7df6edd7d020a46431dcfac7..be448b00dbdff6f328029277904efaddacab5837 100644
--- a/src/ltltest/kind.cc
+++ b/src/ltltest/kind.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/kind.test b/src/ltltest/kind.test
index 592c1a50a9f39d16686a6ef839431220c9853047..651a496231c118a23d22898c0f4252aaa6c9ea0a 100755
--- a/src/ltltest/kind.test
+++ b/src/ltltest/kind.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the constant_term visitor
diff --git a/src/ltltest/length.cc b/src/ltltest/length.cc
index aeb080ae56240cb9e54caf491e8430ac73d850d7..60cf675237ec9121e4e2e69b16bd6a7cdd8d6690 100644
--- a/src/ltltest/length.cc
+++ b/src/ltltest/length.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/length.test b/src/ltltest/length.test
index 96f0a8f347804dc02cc7e9082496724f0934cd43..0a0cfc36b9c2bedcaa4e2e277a098718c2af72cb 100755
--- a/src/ltltest/length.test
+++ b/src/ltltest/length.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs || exit 1
diff --git a/src/ltltest/lunabbrev.test b/src/ltltest/lunabbrev.test
index 1be0a99feb0e9813ddd8425cfef7ce8689e1f7b5..0f6f5a261e41302539e221a7b5df5406886cc858 100755
--- a/src/ltltest/lunabbrev.test
+++ b/src/ltltest/lunabbrev.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the unabbreviate_logic visitor
diff --git a/src/ltltest/nenoform.test b/src/ltltest/nenoform.test
index e48bb059b7d3bd1e66eb13f71de89870baf8b3ad..70bae63fc6806690d327ac4f95afb93d2a1b970b 100755
--- a/src/ltltest/nenoform.test
+++ b/src/ltltest/nenoform.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the negative_normal_form visitor
diff --git a/src/ltltest/parse.test b/src/ltltest/parse.test
index 35fe0082855bd763cfb8948a28f2cfeb0c5f04f8..0d71b1ea630e126515dc936180442a5028a604f9 100755
--- a/src/ltltest/parse.test
+++ b/src/ltltest/parse.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check that spot::ltl::parse succeed on valid input, and that
diff --git a/src/ltltest/parseerr.test b/src/ltltest/parseerr.test
index cc3edd25bd4b05cd98b390e2f4759ac3e33b96a6..e7f8587cec406307b16bb901c8ba1520e5d1366d 100755
--- a/src/ltltest/parseerr.test
+++ b/src/ltltest/parseerr.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check error recovery in parsing.  This also checks how the
diff --git a/src/ltltest/readltl.cc b/src/ltltest/readltl.cc
index a4c07a4e17da44ad2c2b8d5417542a946c35310b..1851925049286fd7aa107f8cec8887293b099098 100644
--- a/src/ltltest/readltl.cc
+++ b/src/ltltest/readltl.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/reduc.cc b/src/ltltest/reduc.cc
index c454a374b59bc0c6ba31552c01ca61cbcc82fe19..368c30b473cf9f2a92c4061e365419607f6c5b28 100644
--- a/src/ltltest/reduc.cc
+++ b/src/ltltest/reduc.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <fstream>
diff --git a/src/ltltest/reduc.test b/src/ltltest/reduc.test
index 75a51eecc8822a885ed6cbff2c444d730a859132..a2d993d1b74c2f6ac3e125320cca0658ed3ff650 100755
--- a/src/ltltest/reduc.test
+++ b/src/ltltest/reduc.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the reduc visitor.
diff --git a/src/ltltest/reduccmp.test b/src/ltltest/reduccmp.test
index 0f8bcce2f800dd660048488c453d8274deec08cf..417da8d2f793282f2a8ff1b86e6b872aab36fc5f 100755
--- a/src/ltltest/reduccmp.test
+++ b/src/ltltest/reduccmp.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check LTL reductions
diff --git a/src/ltltest/reducpsl.test b/src/ltltest/reducpsl.test
index df0b6a1e485da6bab0cf56676b3fcdba7444a4f1..90cee07d19a4acca3d5b286cd11d223da1a83f19 100755
--- a/src/ltltest/reducpsl.test
+++ b/src/ltltest/reducpsl.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the reduc visitor.
diff --git a/src/ltltest/syntimpl.cc b/src/ltltest/syntimpl.cc
index cebcca1d01c20af409bdc6f84750d9e7bf665853..26aecd8c8e5d428902d995ac406c24b013797e0c 100644
--- a/src/ltltest/syntimpl.cc
+++ b/src/ltltest/syntimpl.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/syntimpl.test b/src/ltltest/syntimpl.test
index 9ca48eb27eac6126d06585ebc747532e8fd4dde5..aa981e7e024934c85616de1e0ec92cfc93538502 100755
--- a/src/ltltest/syntimpl.test
+++ b/src/ltltest/syntimpl.test
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check syntactic implication.
diff --git a/src/ltltest/tostring.cc b/src/ltltest/tostring.cc
index f04306a6f5de126d626ccc0ab48a340e4460f035..815c4558d8be73843f67f9ec1342eb6ed7d1a43c 100644
--- a/src/ltltest/tostring.cc
+++ b/src/ltltest/tostring.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/ltltest/tostring.test b/src/ltltest/tostring.test
index 2fd5ba8e4ea55f703d7b3953f084a2550eda18cc..8b876186dd7423142d85a0a4d1f9088e3f204b06 100755
--- a/src/ltltest/tostring.test
+++ b/src/ltltest/tostring.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for spot::ltl::tostring.
diff --git a/src/ltltest/tunabbrev.test b/src/ltltest/tunabbrev.test
index 60a7b3dffbe590f5805feb40fffb54b2bd7111c2..b80230846291ef675d4494f8ace8dc3087a91522 100755
--- a/src/ltltest/tunabbrev.test
+++ b/src/ltltest/tunabbrev.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for the unabbreviate_ltl visitor
diff --git a/src/ltltest/tunenoform.test b/src/ltltest/tunenoform.test
index 67a80cfb6ccff05f35b9de1e3ffcb1a176bb29d9..9c23c0b3a549980c8e30207bc3d05cee27dbc06e 100755
--- a/src/ltltest/tunenoform.test
+++ b/src/ltltest/tunenoform.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check for unabbreviate_ltl + negative_normal_form visitors
diff --git a/src/ltltest/utf8.test b/src/ltltest/utf8.test
index 092a2a12a4318f1bc40c94241c7e2621d9acd3fd..5e9c86a7e960777bec5233f4b1857de6d071c386 100755
--- a/src/ltltest/utf8.test
+++ b/src/ltltest/utf8.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Make sure
diff --git a/src/ltltest/uwrm.test b/src/ltltest/uwrm.test
index 6479a7137f159d811a73d95b52a1f8788728303f..4f8fe5e9a3403354b01af0d97b218ec5627d05e9 100755
--- a/src/ltltest/uwrm.test
+++ b/src/ltltest/uwrm.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Check LTL reductions for U, W, M and R.
diff --git a/src/ltlvisit/Makefile.am b/src/ltlvisit/Makefile.am
index 7b20b29781592d4778e15a7fe405f1df1614e51e..81809e6cee403391f0654f74b77497afbac07b39 100644
--- a/src/ltlvisit/Makefile.am
+++ b/src/ltlvisit/Makefile.am
@@ -9,7 +9,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/ltlvisit/apcollect.cc b/src/ltlvisit/apcollect.cc
index 4a445a3a403707fa2f3dec3200237e8b9c2d2e57..be32748f414ff16cba5687f024c439d844f43384 100644
--- a/src/ltlvisit/apcollect.cc
+++ b/src/ltlvisit/apcollect.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "apcollect.hh"
 #include "ltlvisit/postfix.hh"
diff --git a/src/ltlvisit/apcollect.hh b/src/ltlvisit/apcollect.hh
index a703a6695c026a3d44914eacb82e80fea08a9790..f42869c4c93191bb5dfbdf02f78be80f8f18fb64 100644
--- a/src/ltlvisit/apcollect.hh
+++ b/src/ltlvisit/apcollect.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_APCOLLECT_HH
 # define SPOT_LTLVISIT_APCOLLECT_HH
diff --git a/src/ltlvisit/clone.cc b/src/ltlvisit/clone.cc
index 2170b7b3d4c83988f016fd501efa31b0706c3871..97d3c76b5f3af35d17a22ea0de0ef5eca58133a5 100644
--- a/src/ltlvisit/clone.cc
+++ b/src/ltlvisit/clone.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/allnodes.hh"
 #include "clone.hh"
diff --git a/src/ltlvisit/clone.hh b/src/ltlvisit/clone.hh
index 08126277ddc1d75e04888acca9ce17ec020357bb..8a65b55244bc908b5d6cffc81a58abcd6514e0ad 100644
--- a/src/ltlvisit/clone.hh
+++ b/src/ltlvisit/clone.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_CLONE_HH
 # define SPOT_LTLVISIT_CLONE_HH
diff --git a/src/ltlvisit/contain.cc b/src/ltlvisit/contain.cc
index 9835945fbdf1c13cc7579822eac20b143118f2c8..ccbd54f6d6bb3405feb240351f37f2b57eaa1a30 100644
--- a/src/ltlvisit/contain.cc
+++ b/src/ltlvisit/contain.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "contain.hh"
 #include "simplify.hh"
diff --git a/src/ltlvisit/contain.hh b/src/ltlvisit/contain.hh
index 541f9be3e9a21980714cc52c1cbe2310b1efdcef..8344e2e4125bf56d371e623a65f51626b3e73987 100644
--- a/src/ltlvisit/contain.hh
+++ b/src/ltlvisit/contain.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_CONTAIN_HH
 # define SPOT_LTLVISIT_CONTAIN_HH
diff --git a/src/ltlvisit/destroy.cc b/src/ltlvisit/destroy.cc
index 95c705fb6c14c96aa52482374b9c8492086bf843..0094990ed575f0250fe019b3893e9eb1be191ced 100644
--- a/src/ltlvisit/destroy.cc
+++ b/src/ltlvisit/destroy.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlvisit/destroy.hh"
 
diff --git a/src/ltlvisit/destroy.hh b/src/ltlvisit/destroy.hh
index ab1f6ad54edc4838d9fb71c604ead710b02d95ed..2d1015567fc90fbc0ccbbc983d7ee363a305c4cc 100644
--- a/src/ltlvisit/destroy.hh
+++ b/src/ltlvisit/destroy.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_DESTROY_HH
 # define SPOT_LTLVISIT_DESTROY_HH
diff --git a/src/ltlvisit/dotty.cc b/src/ltlvisit/dotty.cc
index 9c0edbd2350e7fe641fe8a12219c84120fefdca4..2fe5f81d4f6ff209cfe280ada4750bfd0591701b 100644
--- a/src/ltlvisit/dotty.cc
+++ b/src/ltlvisit/dotty.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "misc/hash.hh"
 #include "dotty.hh"
diff --git a/src/ltlvisit/dotty.hh b/src/ltlvisit/dotty.hh
index 420a4f7f819605d053eb8c96bdc1c22c5c5c4b0d..fde60f1bc44625d696dd4a6a2b1d4a85fcf11deb 100644
--- a/src/ltlvisit/dotty.hh
+++ b/src/ltlvisit/dotty.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_DOTTY_HH
 # define SPOT_LTLVISIT_DOTTY_HH
diff --git a/src/ltlvisit/dump.cc b/src/ltlvisit/dump.cc
index 3d94732cf45bff1c3aeb085ba9ef09fef743a689..92cb8f6e453480221ff23e15269fdee2381d8791 100644
--- a/src/ltlvisit/dump.cc
+++ b/src/ltlvisit/dump.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "dump.hh"
 #include "ltlast/visitor.hh"
diff --git a/src/ltlvisit/dump.hh b/src/ltlvisit/dump.hh
index 9420ad349bc90c2c7e595cff99eefdf7059b1b47..c1c75c8228211e488c03c7f403764c0275fe012f 100644
--- a/src/ltlvisit/dump.hh
+++ b/src/ltlvisit/dump.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_DUMP_HH
 # define SPOT_LTLVISIT_DUMP_HH
diff --git a/src/ltlvisit/lbt.cc b/src/ltlvisit/lbt.cc
index 6e5b4df886540a0e9563e244ad1ad6b6658639fb..c153b038d1b7862ec4728693d6ac0eb7fb4dfff7 100644
--- a/src/ltlvisit/lbt.cc
+++ b/src/ltlvisit/lbt.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ltlvisit/lbt.hh b/src/ltlvisit/lbt.hh
index b89c96634b7e8767a7197c24c77b4691f4da181e..3313325a042bca9ec6e8a93f31065f504c19c783 100644
--- a/src/ltlvisit/lbt.hh
+++ b/src/ltlvisit/lbt.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_LBT_HH
 # define SPOT_LTLVISIT_LBT_HH
diff --git a/src/ltlvisit/length.cc b/src/ltlvisit/length.cc
index 476bf6d13ee72a69e4e2580b259f34b726e2b6c5..61af7206e4e8caf6570602422d84a74b8bc15868 100644
--- a/src/ltlvisit/length.cc
+++ b/src/ltlvisit/length.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "length.hh"
 #include "ltlvisit/postfix.hh"
diff --git a/src/ltlvisit/length.hh b/src/ltlvisit/length.hh
index 110666871470c903f71a39e58e81f79ea985d598..48a54238eede89ed1631aadc73c4bfe3ec65adfe 100644
--- a/src/ltlvisit/length.hh
+++ b/src/ltlvisit/length.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_LENGTH_HH
 # define SPOT_LTLVISIT_LENGTH_HH
diff --git a/src/ltlvisit/lunabbrev.cc b/src/ltlvisit/lunabbrev.cc
index 4756f37b07970516739f5ee81a1f3a158c370c26..a426b8b53989753aeb611c9a4d50db5b37bf11f2 100644
--- a/src/ltlvisit/lunabbrev.cc
+++ b/src/ltlvisit/lunabbrev.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/allnodes.hh"
 #include "lunabbrev.hh"
diff --git a/src/ltlvisit/lunabbrev.hh b/src/ltlvisit/lunabbrev.hh
index e5fc001e22d8f52a358aa981fdd90c982cd6274a..3bff9949a9e5b8a44bab58be9b8589a75df9f9ff 100644
--- a/src/ltlvisit/lunabbrev.hh
+++ b/src/ltlvisit/lunabbrev.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_LUNABBREV_HH
 # define SPOT_LTLVISIT_LUNABBREV_HH
diff --git a/src/ltlvisit/mark.cc b/src/ltlvisit/mark.cc
index 89a60fc9284343f9375fa7a404ecf9363770ab07..9078375da9274296281e873d8c4564ebb4beefd2 100644
--- a/src/ltlvisit/mark.cc
+++ b/src/ltlvisit/mark.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "mark.hh"
 #include "ltlast/allnodes.hh"
diff --git a/src/ltlvisit/mark.hh b/src/ltlvisit/mark.hh
index 7eb262800ab35aed9d80937bb924b6a4cb955917..75f45d0d90c8c9e8c0acfcb429c2d152867529ee 100644
--- a/src/ltlvisit/mark.hh
+++ b/src/ltlvisit/mark.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_MARK_HH
 # define SPOT_LTLVISIT_MARK_HH
diff --git a/src/ltlvisit/nenoform.cc b/src/ltlvisit/nenoform.cc
index 65120485afbee04bf87fc33a733a5ce21cba7c43..5e40172ae5c7d262eafb11f05c164c6828d45983 100644
--- a/src/ltlvisit/nenoform.cc
+++ b/src/ltlvisit/nenoform.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "simplify.hh"
 
diff --git a/src/ltlvisit/nenoform.hh b/src/ltlvisit/nenoform.hh
index bba5998f6d0d35b8ffa055a733dbeb659ec0b913..879f5f8b5505f7213138f243c8891724f806e739 100644
--- a/src/ltlvisit/nenoform.hh
+++ b/src/ltlvisit/nenoform.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_NENOFORM_HH
 # define SPOT_LTLVISIT_NENOFORM_HH
diff --git a/src/ltlvisit/postfix.cc b/src/ltlvisit/postfix.cc
index 91507d307066b33b07832df17691e72e575b4466..a9386603affd2429cdfbb31c922833973d219988 100644
--- a/src/ltlvisit/postfix.cc
+++ b/src/ltlvisit/postfix.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlvisit/postfix.hh"
 #include "ltlast/allnodes.hh"
diff --git a/src/ltlvisit/postfix.hh b/src/ltlvisit/postfix.hh
index 642a61f5e69a55631338067c8a655a9dfd374751..80b719b72e62da81e0060d53bca0d0e2a3b6a8ea 100644
--- a/src/ltlvisit/postfix.hh
+++ b/src/ltlvisit/postfix.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_POSTFIX_HH
 # define SPOT_LTLVISIT_POSTFIX_HH
diff --git a/src/ltlvisit/randomltl.cc b/src/ltlvisit/randomltl.cc
index c849a00008da1327632d27e3383e0613c197e010..99c268cf68c1e9fb0c3f730aa1fb19783d654a99 100644
--- a/src/ltlvisit/randomltl.cc
+++ b/src/ltlvisit/randomltl.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <algorithm>
diff --git a/src/ltlvisit/randomltl.hh b/src/ltlvisit/randomltl.hh
index f1fb21036361113fc6b307e8f6af118606b7d532..c2bafb5236d417f3b3e6b84f0e8b3a6047c76f3a 100644
--- a/src/ltlvisit/randomltl.hh
+++ b/src/ltlvisit/randomltl.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_RANDOMLTL_HH
 # define SPOT_LTLVISIT_RANDOMLTL_HH
diff --git a/src/ltlvisit/reduce.cc b/src/ltlvisit/reduce.cc
index d081e033cf60f445ca7f2a786cfbccb0b350c6ad..0087f558f7cb149efda7fad291682168a071a899 100644
--- a/src/ltlvisit/reduce.cc
+++ b/src/ltlvisit/reduce.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "simplify.hh"
diff --git a/src/ltlvisit/reduce.hh b/src/ltlvisit/reduce.hh
index 3c8cd29a6a91082e4ff0c0f62605c9e470aa5f87..b89eb76fa64a16d385a13c9307d348c3445c605a 100644
--- a/src/ltlvisit/reduce.hh
+++ b/src/ltlvisit/reduce.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_REDUCE_HH
 # define SPOT_LTLVISIT_REDUCE_HH
diff --git a/src/ltlvisit/relabel.cc b/src/ltlvisit/relabel.cc
index ecda0d53768425dae03dec1da2dec315fba7ce1d..9236c283b01ae6b0048d5f4fd716daad07304ef7 100644
--- a/src/ltlvisit/relabel.cc
+++ b/src/ltlvisit/relabel.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <relabel.hh>
 #include <sstream>
diff --git a/src/ltlvisit/relabel.hh b/src/ltlvisit/relabel.hh
index 4fe90ea71e08305bea421726a9d8dcfa73c5dee3..25d46a246fd0a4a2fd56f2fcdbbb179ac4b0fc15 100644
--- a/src/ltlvisit/relabel.hh
+++ b/src/ltlvisit/relabel.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_RELABEL_HH
 # define SPOT_LTLVISIT_RELABEL_HH
diff --git a/src/ltlvisit/simpfg.cc b/src/ltlvisit/simpfg.cc
index e9c594c6bafaa5ae9285fe48526930302d3b7d3d..6b9a94dc3066148fc554015fb3c8f88672a9e7bf 100644
--- a/src/ltlvisit/simpfg.cc
+++ b/src/ltlvisit/simpfg.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/allnodes.hh"
 #include "ltlvisit/clone.hh"
diff --git a/src/ltlvisit/simpfg.hh b/src/ltlvisit/simpfg.hh
index 8d226e3f757700c6bbb6ca01d66e3bfc127285e6..ad8a64259eaecf8adfb2bade77e18e3fa1de2c24 100644
--- a/src/ltlvisit/simpfg.hh
+++ b/src/ltlvisit/simpfg.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_SIMPFG_HH
 # define SPOT_LTLVISIT_SIMPFG_HH
diff --git a/src/ltlvisit/simplify.cc b/src/ltlvisit/simplify.cc
index f01b9cbc7acf4131fe90722f822465131d9a599c..31238fe58473f07fec591d740ce682cd2709601f 100644
--- a/src/ltlvisit/simplify.cc
+++ b/src/ltlvisit/simplify.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 //#define TRACE
diff --git a/src/ltlvisit/simplify.hh b/src/ltlvisit/simplify.hh
index 0f2c8c4252fc178ede517910485c30535b7e787e..88da6b4b1c4808fbd3df93cb311ae16ffb8b1c3f 100644
--- a/src/ltlvisit/simplify.hh
+++ b/src/ltlvisit/simplify.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_SIMPLIFY_HH
 # define SPOT_LTLVISIT_SIMPLIFY_HH
diff --git a/src/ltlvisit/snf.cc b/src/ltlvisit/snf.cc
index 57d6b16b83b09bd3a3c239ea5ed6a7dc72ef990a..35447316fd31fcf864fc3da7fa35e265436633fc 100644
--- a/src/ltlvisit/snf.cc
+++ b/src/ltlvisit/snf.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "snf.hh"
 #include "ltlast/allnodes.hh"
diff --git a/src/ltlvisit/snf.hh b/src/ltlvisit/snf.hh
index f69bfb7abf68d3fafec9d5b8d510e224050bef03..ae675a6a76d2906d4a6dabe586ade13041ef7430 100644
--- a/src/ltlvisit/snf.hh
+++ b/src/ltlvisit/snf.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_SNF_HH
 #define SPOT_LTLVISIT_SNF_HH
diff --git a/src/ltlvisit/tostring.cc b/src/ltlvisit/tostring.cc
index 0b8091adbaa8c8350d1f6c9800ea3ab8aa559b72..9e8198d30a0b83d827bc686d55c483442e8a5a92 100644
--- a/src/ltlvisit/tostring.cc
+++ b/src/ltlvisit/tostring.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <sstream>
diff --git a/src/ltlvisit/tostring.hh b/src/ltlvisit/tostring.hh
index 6d6749db7b058159e0bdbf6aacccf2601e1be357..47ef51b6951e5801d6b6f5715397e30a1284cec4 100644
--- a/src/ltlvisit/tostring.hh
+++ b/src/ltlvisit/tostring.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_TOSTRING_HH
 # define SPOT_LTLVISIT_TOSTRING_HH
diff --git a/src/ltlvisit/tunabbrev.cc b/src/ltlvisit/tunabbrev.cc
index 806e7c8c8865805a88ba47a297aa0df281354f8e..baf4021d3320a7fc80e4ec73ce3018d43b57b407 100644
--- a/src/ltlvisit/tunabbrev.cc
+++ b/src/ltlvisit/tunabbrev.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/allnodes.hh"
 #include "tunabbrev.hh"
diff --git a/src/ltlvisit/tunabbrev.hh b/src/ltlvisit/tunabbrev.hh
index 3afc58a860584ac240b279968632c023c8673881..ad296d51e3a6ab7d44c50d1abb45008d9c64fdd5 100644
--- a/src/ltlvisit/tunabbrev.hh
+++ b/src/ltlvisit/tunabbrev.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_TUNABBREV_HH
 # define SPOT_LTLVISIT_TUNABBREV_HH
diff --git a/src/ltlvisit/wmunabbrev.cc b/src/ltlvisit/wmunabbrev.cc
index 1f6c0eb4e9799de8a9f07cf939cb12d564fad180..4fa106e98de7caef78c7e9272628c251eb0cc40b 100644
--- a/src/ltlvisit/wmunabbrev.cc
+++ b/src/ltlvisit/wmunabbrev.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/allnodes.hh"
 #include "clone.hh"
diff --git a/src/ltlvisit/wmunabbrev.hh b/src/ltlvisit/wmunabbrev.hh
index 4604fc2d587f011836eea16653b8f9d78945a675..160ed7076c3b0358a9bbccbcc65f406b3f9699bc 100644
--- a/src/ltlvisit/wmunabbrev.hh
+++ b/src/ltlvisit/wmunabbrev.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_LTLVISIT_WMUNABBREV_HH
 # define SPOT_LTLVISIT_WMUNABBREV_HH
diff --git a/src/misc/Makefile.am b/src/misc/Makefile.am
index 6228db4722c7e6d8064d92b2347b0bce33287fe5..a287212ec856ab26237b3fa6d2824f1841d5c6d8 100644
--- a/src/misc/Makefile.am
+++ b/src/misc/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/misc/acccompl.cc b/src/misc/acccompl.cc
index cb2156c6f5c8c2702ae5db817c30d91e64eae095..aee09f31dbd8960c75287a881d5d6a79e599ff53 100644
--- a/src/misc/acccompl.cc
+++ b/src/misc/acccompl.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "acccompl.hh"
 
diff --git a/src/misc/acccompl.hh b/src/misc/acccompl.hh
index 43315dbc2f11fdbb7d2b465c3f24d209bd4ea617..af66ed98414ae37199480ccd59ef43ea6fe6df04 100644
--- a/src/misc/acccompl.hh
+++ b/src/misc/acccompl.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_MISC_ACCCOMPL_HH
diff --git a/src/misc/accconv.cc b/src/misc/accconv.cc
index 21a7367f6dd4e9237d9f21142b320e5c9a6dd124..2605cfda1fa2df6186c9b8721cb40c4cc0554e4a 100644
--- a/src/misc/accconv.cc
+++ b/src/misc/accconv.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "accconv.hh"
diff --git a/src/misc/accconv.hh b/src/misc/accconv.hh
index 6bdb46888ec02f6038685e6858ad16cfaa7d0883..7b7383ff7e57ea430733c9da7b132050bb5dadd3 100644
--- a/src/misc/accconv.hh
+++ b/src/misc/accconv.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_ACCCONV_HH
 # define SPOT_MISC_ACCCONV_HH
diff --git a/src/misc/bareword.cc b/src/misc/bareword.cc
index c1628edd7697053b5c0db73cb9f514c17921eda1..20df5d025fd93dbf427342d096262350691ddba0 100644
--- a/src/misc/bareword.cc
+++ b/src/misc/bareword.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "bareword.hh"
 #include <ctype.h>
diff --git a/src/misc/bareword.hh b/src/misc/bareword.hh
index 33cc5efb630a8d83184f21fd6db5076d60510412..68434b39c41252857c8d93e0900b28c5ff4141ac 100644
--- a/src/misc/bareword.hh
+++ b/src/misc/bareword.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_BAREWORD_HH
 # define SPOT_MISC_BAREWORD_HH
diff --git a/src/misc/bddalloc.cc b/src/misc/bddalloc.cc
index fd135612a1dfe2ab062a455b1f4475d5cd94777c..aa24e08cb423c441fbfc8a2230f45bcc42a39926 100644
--- a/src/misc/bddalloc.cc
+++ b/src/misc/bddalloc.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <bdd.h>
 #include <cassert>
diff --git a/src/misc/bddalloc.hh b/src/misc/bddalloc.hh
index d63f106f49b86f5236105b8727504364eb97ea35..6c74e8f6a2ad18cbdcc1b1badee65a4027b8dc92 100644
--- a/src/misc/bddalloc.hh
+++ b/src/misc/bddalloc.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_BDDALLOC_HH
 # define SPOT_MISC_BDDALLOC_HH
diff --git a/src/misc/bddlt.hh b/src/misc/bddlt.hh
index 249138c169ddbbbe8cf25882b83bb7e3b1687e0a..e3d611acb8fd528acfc2ff62808c462693e7db38 100644
--- a/src/misc/bddlt.hh
+++ b/src/misc/bddlt.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_BDDLT_HH
 # define SPOT_MISC_BDDLT_HH
diff --git a/src/misc/bddop.cc b/src/misc/bddop.cc
index b3b57a23f33e336af3163ef9c7826b83be11f2bf..c864a4405ecca14c8d4bc6bd012f9b83199f325d 100644
--- a/src/misc/bddop.cc
+++ b/src/misc/bddop.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "bddop.hh"
diff --git a/src/misc/bddop.hh b/src/misc/bddop.hh
index 2ead01827a3d5db9f0c99d5e5e23b7ac9cef87b9..05ab5aa47adb8087fc4a43f8cdc7d7add34df622 100644
--- a/src/misc/bddop.hh
+++ b/src/misc/bddop.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_BDDOP_HH
 # define SPOT_MISC_BDDOP_HH
diff --git a/src/misc/casts.hh b/src/misc/casts.hh
index e973e7ef334ed2e58b8137eaebcd90cb2d77e72f..32a6a4bd4a9c3a2318ee2ada1538a2f5ba998a5e 100644
--- a/src/misc/casts.hh
+++ b/src/misc/casts.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_CASTS_HH
 #  define SPOT_MISC_CASTS_HH
diff --git a/src/misc/escape.cc b/src/misc/escape.cc
index a4b1a246c8fb5c1db535bd93e625b88c9094ec26..ad100b95f6705a9c0c3f7d2fdafd112a6427e3e0 100644
--- a/src/misc/escape.cc
+++ b/src/misc/escape.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include <ostream>
diff --git a/src/misc/escape.hh b/src/misc/escape.hh
index 3b9ba16b4222bc85104f9dfb88471e8529a39db0..64ae2909a2619ef4d645bf623e052a6c9c8e90b5 100644
--- a/src/misc/escape.hh
+++ b/src/misc/escape.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_ESCAPE_HH
 # define SPOT_MISC_ESCAPE_HH
diff --git a/src/misc/fixpool.hh b/src/misc/fixpool.hh
index 382fab13125f356a8c7e2072d8517ac5a4db026d..46aefe1ce42f7a85a055d1850f14b676c10fc6b6 100644
--- a/src/misc/fixpool.hh
+++ b/src/misc/fixpool.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_FIXPOOL_HH
 #  define SPOT_MISC_FIXPOOL_HH
diff --git a/src/misc/freelist.cc b/src/misc/freelist.cc
index d2434f3fcdbe50e437f30704194bb26f78113004..dbfa8f4320c22a13fa1963527d481dcd43216448 100644
--- a/src/misc/freelist.cc
+++ b/src/misc/freelist.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "freelist.hh"
 #include <cassert>
diff --git a/src/misc/freelist.hh b/src/misc/freelist.hh
index d87e41cfc3f5d8816122cddc81bd385bd2b475e2..eeadbd1867ab89472a1a997555581b492dda9d02 100644
--- a/src/misc/freelist.hh
+++ b/src/misc/freelist.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_MISC_FREELIST_HH
diff --git a/src/misc/hash.hh b/src/misc/hash.hh
index 9d2dde9be12f32bc28b0a369d3f4f13fd621c16d..4d1d04273854c1b8d13632203250c88b9a8712ee 100644
--- a/src/misc/hash.hh
+++ b/src/misc/hash.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_HASH_HH
 #  define SPOT_MISC_HASH_HH
diff --git a/src/misc/hashfunc.hh b/src/misc/hashfunc.hh
index 975de704d95789cd6cbbf7edbc4b5635b122fa65..2af45cfe07349e7566c6eb617da97ae6e0269d14 100644
--- a/src/misc/hashfunc.hh
+++ b/src/misc/hashfunc.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_HASHFUNC_HH
 # define SPOT_MISC_HASHFUNC_HH
diff --git a/src/misc/intvcmp2.cc b/src/misc/intvcmp2.cc
index c67aa1c3c3546c70e32141432656503cb5568d57..12c9f890542c1658cee2ff76004cf4a187264cb2 100644
--- a/src/misc/intvcmp2.cc
+++ b/src/misc/intvcmp2.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstddef>
 #include <cassert>
diff --git a/src/misc/intvcmp2.hh b/src/misc/intvcmp2.hh
index 4c5ad26cba8449665c2634d3946fd5eb2a8e062e..ab972a74aa0df9d7669b55b2d4f725816193bc04 100644
--- a/src/misc/intvcmp2.hh
+++ b/src/misc/intvcmp2.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_INTVCMP2_HH
 # define SPOT_MISC_INTVCMP2_HH
diff --git a/src/misc/intvcomp.cc b/src/misc/intvcomp.cc
index a5c896547a799d158f8fc17b505b5f654669bd49..dc4519996b92218187512fc6ef52021f29436c72 100644
--- a/src/misc/intvcomp.cc
+++ b/src/misc/intvcomp.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstddef>
 #include <cassert>
diff --git a/src/misc/intvcomp.hh b/src/misc/intvcomp.hh
index bdf63a13bbbe5e996a00761e4d7cef3f7b94524c..ad6aa35a23c0b323ceda0556590cfae7a5bc420d 100644
--- a/src/misc/intvcomp.hh
+++ b/src/misc/intvcomp.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_INTVCOMP_HH
 # define SPOT_MISC_INTVCOMP_HH
diff --git a/src/misc/ltstr.hh b/src/misc/ltstr.hh
index 2bfee2def4faa0537bf71c5f3b1e6724f11d4eea..df4ec19611d5b5cdd2fc8037850389248ec5f589 100644
--- a/src/misc/ltstr.hh
+++ b/src/misc/ltstr.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_LTSTR_HH
 #  define SPOT_MISC_LTSTR_HH
diff --git a/src/misc/memusage.cc b/src/misc/memusage.cc
index 527f20a9df7e75bd67a17f1a755bee0647ded83f..e2a221f88f07c558d7aa104b1599ba0b535cd239 100644
--- a/src/misc/memusage.cc
+++ b/src/misc/memusage.cc
@@ -7,7 +7,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "memusage.hh"
 #include <cstdio>
diff --git a/src/misc/memusage.hh b/src/misc/memusage.hh
index 29f3bfe86010416f41c7e5778640d781f8514c1c..51e7bed303d70f14aab67eb0ee02c70ff14074b9 100644
--- a/src/misc/memusage.hh
+++ b/src/misc/memusage.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_MEMUSAGE_HH
 # define SPOT_MISC_MEMUSAGE_HH
diff --git a/src/misc/minato.cc b/src/misc/minato.cc
index 0fabf3b6fc4fb30283a8922cbd280f2add0b6d46..07bc68b082cc521a3d54fc5804f86e0bc2e7ba74 100644
--- a/src/misc/minato.cc
+++ b/src/misc/minato.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "minato.hh"
 #include <cassert>
diff --git a/src/misc/minato.hh b/src/misc/minato.hh
index 489de978ac29b96000c3c4ed3c78069acf3b449f..2d034fc1b85c148df93ee6589d22a5c66ff4524b 100644
--- a/src/misc/minato.hh
+++ b/src/misc/minato.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_MINATO_HH
 # define SPOT_MISC_MINATO_HH
diff --git a/src/misc/modgray.cc b/src/misc/modgray.cc
index e45e8b6a520c6b70d29258a90eb6605adb0aa99f..1cae48e7eeef8be2d840344325fb9912a232813b 100644
--- a/src/misc/modgray.cc
+++ b/src/misc/modgray.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "modgray.hh"
 
diff --git a/src/misc/modgray.hh b/src/misc/modgray.hh
index b300f61f4c6d3db84b067c41f4f81b6f0c0c04ea..e9f98f433bbde5c765a060c4472f4827e7094efa 100644
--- a/src/misc/modgray.hh
+++ b/src/misc/modgray.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_MODGRAY_HH
 # define SPOT_MISC_MODGRAY_HH
diff --git a/src/misc/mspool.hh b/src/misc/mspool.hh
index 1c0fff8561e6acf8118c2685bd2b97257fd055fa..2f399a3241aa10ffca4622f58d7e9279d969d264 100644
--- a/src/misc/mspool.hh
+++ b/src/misc/mspool.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_MSPOOL_HH
 #  define SPOT_MISC_MSPOOL_HH
diff --git a/src/misc/optionmap.cc b/src/misc/optionmap.cc
index 4300a5db3d92c63fe062c0c296a211e169e5d25f..cbacefb92d45548de26282ac50401325fbcfc988 100644
--- a/src/misc/optionmap.cc
+++ b/src/misc/optionmap.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cstring>
 #include <iostream>
diff --git a/src/misc/optionmap.hh b/src/misc/optionmap.hh
index eca3c05d0eda63ad7a6adda84c7b3ef32a48b2a5..b3f5c850797e30c9636052ec26df05a4f6025875 100644
--- a/src/misc/optionmap.hh
+++ b/src/misc/optionmap.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_OPTIONMAP_HH
 # define SPOT_MISC_OPTIONMAP_HH
diff --git a/src/misc/random.cc b/src/misc/random.cc
index 75a8fa56df7dc6da4a9c01eebed271d47c53a988..c247465a2931de35010410422cfd04105e9ea05d 100644
--- a/src/misc/random.cc
+++ b/src/misc/random.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "_config.h"
 #include "random.hh"
diff --git a/src/misc/random.hh b/src/misc/random.hh
index 9a42478069f1ca1cd8370646586ead989c6284a0..01fb894b656d2dba65eed15a4de703b0b6217809 100644
--- a/src/misc/random.hh
+++ b/src/misc/random.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_RANDOM_HH
 # define SPOT_MISC_RANDOM_HH
diff --git a/src/misc/timer.cc b/src/misc/timer.cc
index 4f2dec24cd74ae139ddf180941a0b200e781b673..c708ed81d27b4009119982f3390257d1b8b33edb 100644
--- a/src/misc/timer.cc
+++ b/src/misc/timer.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "timer.hh"
 #include <iostream>
diff --git a/src/misc/timer.hh b/src/misc/timer.hh
index 207b38b6cee906801478e6c2552080565abb13a3..f400bbeada01936cfa97ebe25d5a9fc43fd180a1 100644
--- a/src/misc/timer.hh
+++ b/src/misc/timer.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_TIMER_HH
 # define SPOT_MISC_TIMER_HH
diff --git a/src/misc/unique_ptr.hh b/src/misc/unique_ptr.hh
index e96eaed5831394b541c396aa373c9d0a76513d3f..c5bc993512312b82c0ead11d15e81275593e3a52 100644
--- a/src/misc/unique_ptr.hh
+++ b/src/misc/unique_ptr.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_UNIQUE_PTR_HH
 # define SPOT_MISC_UNIQUE_PTR_HH
diff --git a/src/misc/version.cc b/src/misc/version.cc
index 5f867336b7275c4e34055e79a6ae98a11d992030..839f70603efb0e6f1a25c94c31c0e7a9462a40a8 100644
--- a/src/misc/version.cc
+++ b/src/misc/version.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "version.hh"
 #include "_config.h"
diff --git a/src/misc/version.hh b/src/misc/version.hh
index 39abb8039a5ac4f6b8fd9c884567c76248daa0c9..ba74804792dc07665cd88eaa8d1e49f664cb2968 100644
--- a/src/misc/version.hh
+++ b/src/misc/version.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_MISC_VERSION_HH
 # define SPOT_MISC_VERSION_HH
diff --git a/src/neverparse/Makefile.am b/src/neverparse/Makefile.am
index 4015032c8f9e1ed0f6496a45552f4675bb606671..2219f474f0cb50e3a7f3937f12959c7dffaca885 100644
--- a/src/neverparse/Makefile.am
+++ b/src/neverparse/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT
 # Disable -Werror because too many versions of flex yield warnings.
diff --git a/src/neverparse/fmterror.cc b/src/neverparse/fmterror.cc
index c23f597ab49a389dd3ac2f0f41a73749d545ad07..8984cecf19fbe9d5d58f1632d7dacfe889ed08d2 100644
--- a/src/neverparse/fmterror.cc
+++ b/src/neverparse/fmterror.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "public.hh"
diff --git a/src/neverparse/neverclaimparse.yy b/src/neverparse/neverclaimparse.yy
index 2308188ef77ebe6b6ab4e4f4f948c6981a88ca05..b0f009657ffc17f4b8a8fbefec222c49b0973901 100644
--- a/src/neverparse/neverclaimparse.yy
+++ b/src/neverparse/neverclaimparse.yy
@@ -6,7 +6,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %language "C++"
 %locations
diff --git a/src/neverparse/neverclaimscan.ll b/src/neverparse/neverclaimscan.ll
index 0ca759eed9e6be8aad2fb548b47a9c68be574b39..71a971dcd289f176d3e1497508b550439e5e9116 100644
--- a/src/neverparse/neverclaimscan.ll
+++ b/src/neverparse/neverclaimscan.ll
@@ -5,7 +5,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %option noyywrap
 %option prefix="neverclaimyy"
diff --git a/src/neverparse/parsedecl.hh b/src/neverparse/parsedecl.hh
index 75b1aa2f631a3bc7fa001aee5566aa2a7c82f171..ea53b8dfedfd0a7e312587c0e0a5ef6fa21d8079 100644
--- a/src/neverparse/parsedecl.hh
+++ b/src/neverparse/parsedecl.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_NEVERPARSE_PARSEDECL_HH
 # define SPOT_NEVERPARSE_PARSEDECL_HH
diff --git a/src/neverparse/public.hh b/src/neverparse/public.hh
index 394f7f03bedbabbc9517b58056580bb025d3a0ad..90873f873bcbc91dfb82d73d105ee00390798ba9 100644
--- a/src/neverparse/public.hh
+++ b/src/neverparse/public.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_NEVERPARSE_PUBLIC_HH
 # define SPOT_NEVERPARSE_PUBLIC_HH
diff --git a/src/saba/Makefile.am b/src/saba/Makefile.am
index 59275d7c067513c5c615447a8f47db71357c261a..b06731a4d1fc0153d1e0cd08cd933bcecab34045 100644
--- a/src/saba/Makefile.am
+++ b/src/saba/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/saba/explicitstateconjunction.cc b/src/saba/explicitstateconjunction.cc
index dbf05bc0a1aefdc465e1e8eb21fcbf8bc183ee75..ae688cd77de91297b5a00d732cef34c055a7cda2 100644
--- a/src/saba/explicitstateconjunction.cc
+++ b/src/saba/explicitstateconjunction.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "explicitstateconjunction.hh"
 
diff --git a/src/saba/explicitstateconjunction.hh b/src/saba/explicitstateconjunction.hh
index 11945cd6cf42206bb45a23b91dfe99dd6e55f350..a5e6d8304bc7118a1cfa6e23d30103dc553e6044 100644
--- a/src/saba/explicitstateconjunction.hh
+++ b/src/saba/explicitstateconjunction.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABA_EXPLICITSTATECONJUNCTION_HH
 # define SPOT_SABA_EXPLICITSTATECONJUNCTION_HH
diff --git a/src/saba/saba.cc b/src/saba/saba.cc
index 5abb802732a83931b4fdfff989ab4d3bfc955970..2b9a67f65879251bd7be8623b4f1de95536743e2 100644
--- a/src/saba/saba.cc
+++ b/src/saba/saba.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "saba.hh"
 
diff --git a/src/saba/saba.hh b/src/saba/saba.hh
index 65eb92e192552147dc60939e2e67f0ee125e4742..a2c2b2fc385c1ac6cd76bcdb354d8364fd25a831 100644
--- a/src/saba/saba.hh
+++ b/src/saba/saba.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABA_SABA_HH
 # define SPOT_SABA_SABA_HH
diff --git a/src/saba/sabacomplementtgba.cc b/src/saba/sabacomplementtgba.cc
index a0f28526e5b7da815a25ecb2ce3cbdf508429ca4..c2be02e1cbfccc12f87335a6cf83b1a7af277303 100644
--- a/src/saba/sabacomplementtgba.cc
+++ b/src/saba/sabacomplementtgba.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <vector>
 #include <cassert>
diff --git a/src/saba/sabacomplementtgba.hh b/src/saba/sabacomplementtgba.hh
index 9487bb8ced47f2c6e41b3ea13481f52d1be6a21c..98af277e1cfca8b0a015ffa3f337c329419d29dd 100644
--- a/src/saba/sabacomplementtgba.hh
+++ b/src/saba/sabacomplementtgba.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABA_SABACOMPLEMENTTGBA_HH
 #define SPOT_SABA_SABACOMPLEMENTTGBA_HH
diff --git a/src/saba/sabastate.hh b/src/saba/sabastate.hh
index 4e82a92637d231aecb15a307a12332b5b399075a..a8ac2fee06140a2b753895f2332192591fd62a11 100644
--- a/src/saba/sabastate.hh
+++ b/src/saba/sabastate.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABA_SABASTATE_HH
 # define SPOT_SABA_SABASTATE_HH
diff --git a/src/saba/sabasucciter.hh b/src/saba/sabasucciter.hh
index 4f2c273e3dd1cfbdb0f8716fdecd0f05ec0563f7..9949a54475d73df1eef07093c8a5f3ff97b94cf2 100644
--- a/src/saba/sabasucciter.hh
+++ b/src/saba/sabasucciter.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABA_SABASUCCITER_HH
 # define SPOT_SABA_SABASUCCITER_HH
diff --git a/src/sabaalgos/Makefile.am b/src/sabaalgos/Makefile.am
index f57a375cefd2f111d5b0a506ccd89405afb6ecc5..ab0dac6f39f4f2f8cc460033082b4769194a880f 100644
--- a/src/sabaalgos/Makefile.am
+++ b/src/sabaalgos/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/sabaalgos/sabadotty.cc b/src/sabaalgos/sabadotty.cc
index 51b72c4fab37dccfef19317a3a54ce2589f88679..abb09a3d220f5cf3e2f0442cb9d534985cbf29ed 100644
--- a/src/sabaalgos/sabadotty.cc
+++ b/src/sabaalgos/sabadotty.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "saba/saba.hh"
diff --git a/src/sabaalgos/sabadotty.hh b/src/sabaalgos/sabadotty.hh
index eec2d4c689d72aca7ef936525b42c8dba26da648..54e82afbe1e6b2768580e07eaa5049debba4efb4 100644
--- a/src/sabaalgos/sabadotty.hh
+++ b/src/sabaalgos/sabadotty.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABAALGOS_SABADOTTY_HH
 # define SPOT_SABAALGOS_SABADOTTY_HH
diff --git a/src/sabaalgos/sabareachiter.cc b/src/sabaalgos/sabareachiter.cc
index e59ff0c0bc91ebec969dc8a1f0cc2a144ddc5c5b..7274b08615144705ef9508e235994ee5f400b7f7 100644
--- a/src/sabaalgos/sabareachiter.cc
+++ b/src/sabaalgos/sabareachiter.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "sabareachiter.hh"
diff --git a/src/sabaalgos/sabareachiter.hh b/src/sabaalgos/sabareachiter.hh
index cd5103536e1eec03e174971823dc383e3365ca55..1ae3e51b32c1d9d2b06d0bcb5db3db48b86c6d78 100644
--- a/src/sabaalgos/sabareachiter.hh
+++ b/src/sabaalgos/sabareachiter.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_SABAALGOS_SABAREACHITER_HH
 # define SPOT_SABAALGOS_SABAREACHITER_HH
diff --git a/src/sabatest/Makefile.am b/src/sabatest/Makefile.am
index a97ade6453ca03f54168575fe70a23ff9ed061a1..c880dd040216aaeb09cd7b10653d46c8d13b23b5 100644
--- a/src/sabatest/Makefile.am
+++ b/src/sabatest/Makefile.am
@@ -5,7 +5,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/sabatest/defs.in b/src/sabatest/defs.in
index fc4b0ba9ebb05ef9119c7493c109b582037a683e..dc39be9550947fa577883ec87f80632649843832 100644
--- a/src/sabatest/defs.in
+++ b/src/sabatest/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/src/sabatest/sabacomplementtgba.cc b/src/sabatest/sabacomplementtgba.cc
index 852b9d982d5a64c8a91d0c09ee10c19bc22aadba..29a46c201b47259a077fcd733cc5a1e129a167ec 100644
--- a/src/sabatest/sabacomplementtgba.cc
+++ b/src/sabatest/sabacomplementtgba.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cstring>
diff --git a/src/sanity/Makefile.am b/src/sanity/Makefile.am
index 90e3097e2a4e9887f51f777f94c76f2df0f6e0ff..1729ba173b0a43ada00bc536aa15532e02878609 100644
--- a/src/sanity/Makefile.am
+++ b/src/sanity/Makefile.am
@@ -9,7 +9,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/sanity/readme.test b/src/sanity/readme.test
index 89e10e2ce857a1b6e10c5ae195048a57255a5e2a..0411417994d486ebe79051c209b3099ccb613aef 100755
--- a/src/sanity/readme.test
+++ b/src/sanity/readme.test
@@ -8,7 +8,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Check that all the directories documented in README exist, and that
 # all directories listed in configure.ac are documented.
diff --git a/src/sanity/style.test b/src/sanity/style.test
index 88f22dc3ecc14863905591e4caddb79c925f84dd..6985b5e71cfd1c8c6db9ef2c9a4fdcdeb99a2be9 100755
--- a/src/sanity/style.test
+++ b/src/sanity/style.test
@@ -55,6 +55,11 @@ for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do
     grep -i 'accepting cond' $file &&
       diag 'accepting -> acceptance'
 
+    grep -i 'version 2 of the License' $file &&
+      diag 'license text should refer to version 2'
+    grep -i 'Temple Place' $file &&
+      diag 'license text should give a url instead of an address'
+
     grep Copyright $file >/dev/null ||
       diag "missing copyright"
 
diff --git a/src/ta/Makefile.am b/src/ta/Makefile.am
index a6a5cc08f33b17385279e6557f073958a849b4ff..b22efcb86f69d571ddf7a42e02bc800b343e1bbd 100644
--- a/src/ta/Makefile.am
+++ b/src/ta/Makefile.am
@@ -6,7 +6,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/ta/ta.cc b/src/ta/ta.cc
index e7b506a026c270cf7d394f1c775e5a585d68d265..db9512a23b9a6f7cec198f98e019ee19f0bcc642 100644
--- a/src/ta/ta.cc
+++ b/src/ta/ta.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "ta.hh"
diff --git a/src/ta/ta.hh b/src/ta/ta.hh
index 44b40de8fcd8fc810200ccf63ce2e89d920529a3..945ac4aaa6f37f439250c60a6277d2d1f0d8f084 100644
--- a/src/ta/ta.hh
+++ b/src/ta/ta.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TA_TA_HH
 # define SPOT_TA_TA_HH
diff --git a/src/ta/taexplicit.cc b/src/ta/taexplicit.cc
index 018edd660d6c58890288fce168fb0be2caf595b4..32750c2679732e6342b30b8ace33544c854a4e1b 100644
--- a/src/ta/taexplicit.cc
+++ b/src/ta/taexplicit.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define TRACE
 
diff --git a/src/ta/taexplicit.hh b/src/ta/taexplicit.hh
index afa05ba265d81afd0c3f884a456b0228ee06224d..b0cf96e4fb570856ada897e6bbd9be3b8e353771 100644
--- a/src/ta/taexplicit.hh
+++ b/src/ta/taexplicit.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more deta_explicitils.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TA_TAEXPLICIT_HH
 # define SPOT_TA_TAEXPLICIT_HH
diff --git a/src/ta/taproduct.cc b/src/ta/taproduct.cc
index e397c76ad854305e99ad6df006b4d9471e3387f3..39bf3d43eb03db16a977386e3f82110da65247c5 100644
--- a/src/ta/taproduct.cc
+++ b/src/ta/taproduct.cc
@@ -7,7 +7,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "taproduct.hh"
 #include <cassert>
diff --git a/src/ta/taproduct.hh b/src/ta/taproduct.hh
index a984f0b698c079a0371743b318b15c93be243b3a..75eec9c49766762f601cf2a918041c6e84a2dd6c 100644
--- a/src/ta/taproduct.hh
+++ b/src/ta/taproduct.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TA_TAPRODUCT_HH
 # define SPOT_TA_TAPRODUCT_HH
diff --git a/src/ta/tgta.cc b/src/ta/tgta.cc
index 981afe4d1b4a94034e5e008b2978faa81b849878..1a2edee8e643c789b460190fe159c664ebac591b 100644
--- a/src/ta/tgta.cc
+++ b/src/ta/tgta.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more deta_explicitils.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgta.hh"
 
diff --git a/src/ta/tgta.hh b/src/ta/tgta.hh
index 3bda29dcd8df82aec42714530235af679912c8b1..24f612ecef218933274e6bfcd3454820b7fda011 100644
--- a/src/ta/tgta.hh
+++ b/src/ta/tgta.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more deta_explicitils.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TA_TGTA_HH
 # define SPOT_TA_TGTA_HH
diff --git a/src/ta/tgtaexplicit.cc b/src/ta/tgtaexplicit.cc
index 1cf68c2114890f64b9a33e9519d62b54f545d058..91d70b4304298ca60faa887771a4b6c0294f9b3f 100644
--- a/src/ta/tgtaexplicit.cc
+++ b/src/ta/tgtaexplicit.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/atomic_prop.hh"
 #include "ltlast/constant.hh"
diff --git a/src/ta/tgtaexplicit.hh b/src/ta/tgtaexplicit.hh
index 39ed46230b3a3e96bcacbcbff81f048cec8e06b6..a9374e5f687d179dc46015d8137f69418183ee5e 100644
--- a/src/ta/tgtaexplicit.hh
+++ b/src/ta/tgtaexplicit.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more deta_explicitils.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TA_TGTAEXPLICIT_HH
 # define SPOT_TA_TGTAEXPLICIT_HH
diff --git a/src/ta/tgtaproduct.cc b/src/ta/tgtaproduct.cc
index dfe0fd059969538678504890614bcf00b6d76437..dc7284be7928d715b3abe9c49bd48d292e095071 100644
--- a/src/ta/tgtaproduct.cc
+++ b/src/ta/tgtaproduct.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 //#define TRACE
diff --git a/src/ta/tgtaproduct.hh b/src/ta/tgtaproduct.hh
index da99c198b9865f5bf4e39eab35edb6fb4179d590..507cfae8eb4c86e4e0baf4a00eaacd3b645151a7 100644
--- a/src/ta/tgtaproduct.hh
+++ b/src/ta/tgtaproduct.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TA_TGTAPRODUCT_HH
 # define SPOT_TA_TGTAPRODUCT_HH
diff --git a/src/taalgos/Makefile.am b/src/taalgos/Makefile.am
index d28701809082e8f6a1eda894370e55eda5d216c0..465ecff901fec9317cb08f02d8e9d6f8cb8c86c1 100644
--- a/src/taalgos/Makefile.am
+++ b/src/taalgos/Makefile.am
@@ -6,7 +6,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
diff --git a/src/taalgos/dotty.cc b/src/taalgos/dotty.cc
index 52aa30898069bd8fae2e0b778fcd91d834f3cdaa..a23ba224901cc30f5a0d7b103329c76430124edd 100644
--- a/src/taalgos/dotty.cc
+++ b/src/taalgos/dotty.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "dotty.hh"
diff --git a/src/taalgos/dotty.hh b/src/taalgos/dotty.hh
index edfbe313af34cb26ef37bdb64d3b7dbec2dfb687..33726bc36e17a102213da7cb6dd35b95ef6765fe 100644
--- a/src/taalgos/dotty.hh
+++ b/src/taalgos/dotty.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_DOTTY_HH
 # define SPOT_TAALGOS_DOTTY_HH
diff --git a/src/taalgos/emptinessta.cc b/src/taalgos/emptinessta.cc
index 157cc2f7c41ac6e3589b2232969df7ae1a94c8d7..039dcbe254652524fbd102d3e0f6c3860b841556 100644
--- a/src/taalgos/emptinessta.cc
+++ b/src/taalgos/emptinessta.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define TRACE
 
diff --git a/src/taalgos/emptinessta.hh b/src/taalgos/emptinessta.hh
index 873c33a115f7b7e74c6e361642da6672cbb00c62..f0bdda16558595f707e8bf570321d53304541627 100644
--- a/src/taalgos/emptinessta.hh
+++ b/src/taalgos/emptinessta.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_EMPTINESSTA_HH
 # define SPOT_TAALGOS_EMPTINESSTA_HH
diff --git a/src/taalgos/minimize.cc b/src/taalgos/minimize.cc
index 851258811adf2109447a93cbb11e2dcc9e0fbe51..7f064a63aea7dba260fc45cad6d8c1c72d0ea0d3 100644
--- a/src/taalgos/minimize.cc
+++ b/src/taalgos/minimize.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 //#define TRACE
diff --git a/src/taalgos/minimize.hh b/src/taalgos/minimize.hh
index a4c68a912f10381d7c1f2c19b28a25ade3f5dd29..40cd716cf6176a9edeee0d5f49eb8ac16a1bba51 100644
--- a/src/taalgos/minimize.hh
+++ b/src/taalgos/minimize.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_MINIMIZE_HH
 # define SPOT_TAALGOS_MINIMIZE_HH
diff --git a/src/taalgos/reachiter.cc b/src/taalgos/reachiter.cc
index 5a9de819956a74b06f848c53314523cc2d891ae7..579d5c8f2423787d37d07e698260d9486fe34e06 100644
--- a/src/taalgos/reachiter.cc
+++ b/src/taalgos/reachiter.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "reachiter.hh"
diff --git a/src/taalgos/reachiter.hh b/src/taalgos/reachiter.hh
index f2280f4e664cf80cdd687d627a2ba660d1547006..d7913b5161aec45d9ff8fcb71df19b5ecffda88e 100644
--- a/src/taalgos/reachiter.hh
+++ b/src/taalgos/reachiter.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_REACHITER_HH
 # define SPOT_TAALGOS_REACHITER_HH
diff --git a/src/taalgos/statessetbuilder.cc b/src/taalgos/statessetbuilder.cc
index 2b1cfbdd6d4056797bae2d0abca03b451192a0c1..7581a13a5a48b163efe1c18f88d6fef31517c854 100644
--- a/src/taalgos/statessetbuilder.cc
+++ b/src/taalgos/statessetbuilder.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "ta/ta.hh"
diff --git a/src/taalgos/statessetbuilder.hh b/src/taalgos/statessetbuilder.hh
index 2745c7b165d6c26992242fd2d4ce186250bf4b49..aebd7e2d4a22f9b1ed158e38e17459c5ec5324fc 100644
--- a/src/taalgos/statessetbuilder.hh
+++ b/src/taalgos/statessetbuilder.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_STATESSETBUILDER_HH
 # define SPOT_TAALGOS_STATESSETBUILDER_HH
diff --git a/src/taalgos/stats.cc b/src/taalgos/stats.cc
index 7c7255133aff6c31708d5a81da52f87ea4a32c08..ec576cf59c54f39072e9dddc0fc7cf32bdb71d49 100644
--- a/src/taalgos/stats.cc
+++ b/src/taalgos/stats.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "ta/ta.hh"
diff --git a/src/taalgos/stats.hh b/src/taalgos/stats.hh
index f7c6a99a0698460a9d90b8a4237c1d68c09bdcc2..d3fd305d64a9b83011e0541aff119c3fceca1f0b 100644
--- a/src/taalgos/stats.hh
+++ b/src/taalgos/stats.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_STATS_HH
 # define SPOT_TAALGOS_STATS_HH
diff --git a/src/taalgos/tgba2ta.cc b/src/taalgos/tgba2ta.cc
index d8fb073040963954fe7eea8a006a81bb1d1a39e4..bed729472fb482a205b5b0f3123c7ead53e4c350 100644
--- a/src/taalgos/tgba2ta.cc
+++ b/src/taalgos/tgba2ta.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define TRACE
 
diff --git a/src/taalgos/tgba2ta.hh b/src/taalgos/tgba2ta.hh
index 1286333cef04421015df7dc642267bb96f8feb04..b32739a249cea5d733c399c0e2ea8bd4b2e44823 100644
--- a/src/taalgos/tgba2ta.hh
+++ b/src/taalgos/tgba2ta.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TAALGOS_TGBA2TA_HH
 # define SPOT_TAALGOS_TGBA2TA_HH
diff --git a/src/tgba/Makefile.am b/src/tgba/Makefile.am
index f9eca43581377644f19eff60dcea8858d70b6860..4928a16e7dc6c4d453636b6f259d22f72bc5f8fa 100644
--- a/src/tgba/Makefile.am
+++ b/src/tgba/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/tgba/bdddict.cc b/src/tgba/bdddict.cc
index 4d5f558f965390cc606d6559b5e6f510549e3532..94e4c2d9fadaad5054397a1c9d093fffb1c402f5 100644
--- a/src/tgba/bdddict.cc
+++ b/src/tgba/bdddict.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include <sstream>
diff --git a/src/tgba/bdddict.hh b/src/tgba/bdddict.hh
index 17600aeaadea77ba7b7c9dab862b4988d5949972..1cc4c0f215d34b8c0ec56d80eba0e11c491a97e6 100644
--- a/src/tgba/bdddict.hh
+++ b/src/tgba/bdddict.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_BDDDICT_HH
 # define SPOT_TGBA_BDDDICT_HH
diff --git a/src/tgba/bddprint.cc b/src/tgba/bddprint.cc
index 2188cf05905ae655ac9c10cec16a9d861e784398..f324aa03ce92acfefbc7a6547feab618d07549de 100644
--- a/src/tgba/bddprint.cc
+++ b/src/tgba/bddprint.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include <cassert>
diff --git a/src/tgba/bddprint.hh b/src/tgba/bddprint.hh
index f509a9c1da0ed5a31f51ad72616ff4d3440afee9..7b162d74a4d12857f267d25f289901f8bdfd2d85 100644
--- a/src/tgba/bddprint.hh
+++ b/src/tgba/bddprint.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_BDDPRINT_HH
 # define SPOT_TGBA_BDDPRINT_HH
diff --git a/src/tgba/formula2bdd.cc b/src/tgba/formula2bdd.cc
index 0edbd4ff699803e0ea311b3dcafe4c6e1b9f701a..47e3b9ddaa54427601c29fcdba5be1a52ab4dacd 100644
--- a/src/tgba/formula2bdd.cc
+++ b/src/tgba/formula2bdd.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "formula2bdd.hh"
diff --git a/src/tgba/formula2bdd.hh b/src/tgba/formula2bdd.hh
index 8c787c65526a7e73d166488222fe23808d765881..4c98c26db86077af04bd489433558b1804fe81f6 100644
--- a/src/tgba/formula2bdd.hh
+++ b/src/tgba/formula2bdd.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_FORMULA2BDD_HH
 # define SPOT_TGBA_FORMULA2BDD_HH
diff --git a/src/tgba/futurecondcol.cc b/src/tgba/futurecondcol.cc
index 8bef890fb8f0d45127cef98a61ef2b20f118095a..019eff8b357648c0d19ea4acbbe649258384c619 100644
--- a/src/tgba/futurecondcol.cc
+++ b/src/tgba/futurecondcol.cc
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include "futurecondcol.hh"
diff --git a/src/tgba/futurecondcol.hh b/src/tgba/futurecondcol.hh
index 82669553a1d2765659db6912019e8a6c26c402f3..7cae12fde5203e1c5507f4685dfe023dd784b851 100644
--- a/src/tgba/futurecondcol.hh
+++ b/src/tgba/futurecondcol.hh
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_FUTURECONDCOL_HH
 # define SPOT_TGBA_FUTURECONDCOL_HH
diff --git a/src/tgba/public.hh b/src/tgba/public.hh
index 254a2cd2fd526d79bce5ff70f84e143e1b20827a..ff7ceeb43f9d765081b8a03a5268cd4ffdcf21df 100644
--- a/src/tgba/public.hh
+++ b/src/tgba/public.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_PUBLIC_HH
 # define SPOT_TGBA_PUBLIC_HH
diff --git a/src/tgba/sba.hh b/src/tgba/sba.hh
index 31f72ce65e828a55d7c60d17d32abd154389d190..e755a06a44fc3853118a3e21a7c4fb45095d2e4f 100644
--- a/src/tgba/sba.hh
+++ b/src/tgba/sba.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_SBA_HH
 # define SPOT_TGBA_SBA_HH
diff --git a/src/tgba/state.hh b/src/tgba/state.hh
index 6692189f02c6c4c08dbf02437112c57a11e572b8..c6af2dfac4b62c292924d6907fb8f43b1b87d8da 100644
--- a/src/tgba/state.hh
+++ b/src/tgba/state.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_STATE_HH
 # define SPOT_TGBA_STATE_HH
diff --git a/src/tgba/statebdd.cc b/src/tgba/statebdd.cc
index 99794a8ebd2817fc958391250bf38604cab4e8fe..0b5b08158da8748c352668106b68648db356017c 100644
--- a/src/tgba/statebdd.cc
+++ b/src/tgba/statebdd.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "statebdd.hh"
 #include <bdd.h>
diff --git a/src/tgba/statebdd.hh b/src/tgba/statebdd.hh
index c045af9964e6361c09888f7a1f8545b92dbcd9e2..2edb42b3692ce49119629ac30a50756bd71a8c90 100644
--- a/src/tgba/statebdd.hh
+++ b/src/tgba/statebdd.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_STATEBDD_HH
 # define SPOT_TGBA_STATEBDD_HH
diff --git a/src/tgba/succiter.hh b/src/tgba/succiter.hh
index b15b9393df93aa65e405ef4e64c4537081bc9082..5a640a0b27c5a5efff82f428a2723692c24e679f 100644
--- a/src/tgba/succiter.hh
+++ b/src/tgba/succiter.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_SUCCITER_HH
 # define SPOT_TGBA_SUCCITER_HH
diff --git a/src/tgba/succiterconcrete.cc b/src/tgba/succiterconcrete.cc
index 0fc9b53071d728b2acebbd83d1747997434b0fd2..7c27e655c9d2db32170bb29448c459162ac191fc 100644
--- a/src/tgba/succiterconcrete.cc
+++ b/src/tgba/succiterconcrete.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "succiterconcrete.hh"
 #include <cassert>
diff --git a/src/tgba/succiterconcrete.hh b/src/tgba/succiterconcrete.hh
index e2dd3a9173667d8cc6b489f360cffc88b5ad15ec..29136b8be12099ad5bb5c4c62feb6fe6af154cc5 100644
--- a/src/tgba/succiterconcrete.hh
+++ b/src/tgba/succiterconcrete.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_SUCCITERCONCRETE_HH
 # define SPOT_TGBA_SUCCITERCONCRETE_HH
diff --git a/src/tgba/taatgba.cc b/src/tgba/taatgba.cc
index 408e0f51ffa0307b867dbfeb8d7b031b724567fe..0f1ef39c1e69bd396177149abdbf238be61426f2 100644
--- a/src/tgba/taatgba.cc
+++ b/src/tgba/taatgba.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <map>
 #include <algorithm>
diff --git a/src/tgba/taatgba.hh b/src/tgba/taatgba.hh
index 51b43574789ec6e883675e32cf6957f5fab1c740..2cc2cfad253bd396c34a108b47c8bdf056253237 100644
--- a/src/tgba/taatgba.hh
+++ b/src/tgba/taatgba.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TAATGBA_HH
 # define SPOT_TGBA_TAATGBA_HH
diff --git a/src/tgba/tgba.cc b/src/tgba/tgba.cc
index dd6a46fadb89ebce47233bea129154621eff479b..264fe426c05f82a6b94cf49970e5fef7b09813ab 100644
--- a/src/tgba/tgba.cc
+++ b/src/tgba/tgba.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgba.hh"
 
diff --git a/src/tgba/tgba.hh b/src/tgba/tgba.hh
index 361aada3875ac2d80ec015967fbc429c44a39841..ee1f0799c72e05229bdc7bd1ad1b4637c7fc219f 100644
--- a/src/tgba/tgba.hh
+++ b/src/tgba/tgba.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBA_HH
 # define SPOT_TGBA_TGBA_HH
diff --git a/src/tgba/tgbabddconcrete.cc b/src/tgba/tgbabddconcrete.cc
index c13f33d109fd7aba9b6f615ae7905330f171758c..a8aa096c213f223da5c82cc6a192c5285eec64f4 100644
--- a/src/tgba/tgbabddconcrete.cc
+++ b/src/tgba/tgbabddconcrete.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgbabddconcrete.hh"
 #include "bddprint.hh"
diff --git a/src/tgba/tgbabddconcrete.hh b/src/tgba/tgbabddconcrete.hh
index 066c8a96451d94a196ef0b58a6be2502d2f42d6a..5de0edb21c5e14ecaff728d3004c78798c382fac 100644
--- a/src/tgba/tgbabddconcrete.hh
+++ b/src/tgba/tgbabddconcrete.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBABDDCONCRETE_HH
 # define SPOT_TGBA_TGBABDDCONCRETE_HH
diff --git a/src/tgba/tgbabddconcretefactory.cc b/src/tgba/tgbabddconcretefactory.cc
index ccd69c3aeb8d1c070a5cdb477426aa64811e3a90..3d109e3bdb97147255c4e6834a55e5e2cf90c37c 100644
--- a/src/tgba/tgbabddconcretefactory.cc
+++ b/src/tgba/tgbabddconcretefactory.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgbabddconcretefactory.hh"
 
diff --git a/src/tgba/tgbabddconcretefactory.hh b/src/tgba/tgbabddconcretefactory.hh
index d67fc62dd55c8bf93bf27e450dddfd1c05732720..9b4ba488af7193cfcd823b6839de0275ed1634e7 100644
--- a/src/tgba/tgbabddconcretefactory.hh
+++ b/src/tgba/tgbabddconcretefactory.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBABDDCONCRETEFACTORY_HH
 # define SPOT_TGBA_TGBABDDCONCRETEFACTORY_HH
diff --git a/src/tgba/tgbabddconcreteproduct.cc b/src/tgba/tgbabddconcreteproduct.cc
index 920e8d85f587e69c340a7fa6e4a22460278bab7b..68ee1381dcb38c8a8fb09804a5cde222def42ac9 100644
--- a/src/tgba/tgbabddconcreteproduct.cc
+++ b/src/tgba/tgbabddconcreteproduct.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "tgbabddconcreteproduct.hh"
diff --git a/src/tgba/tgbabddconcreteproduct.hh b/src/tgba/tgbabddconcreteproduct.hh
index 8d22ec0838cc75421ca965ccf37b508211eec7e4..b4041e0d422c1cab8e6c2493cad1637f45c6ca7e 100644
--- a/src/tgba/tgbabddconcreteproduct.hh
+++ b/src/tgba/tgbabddconcreteproduct.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBABDDCONCRETEPRODUCT_HH
 # define SPOT_TGBA_TGBABDDCONCRETEPRODUCT_HH
diff --git a/src/tgba/tgbabddcoredata.cc b/src/tgba/tgbabddcoredata.cc
index 63b3d5eece1412b258a0831516d1acf0d258cc21..0860183720eeec85be91a9d958b687b9917828f7 100644
--- a/src/tgba/tgbabddcoredata.cc
+++ b/src/tgba/tgbabddcoredata.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "tgbabddcoredata.hh"
diff --git a/src/tgba/tgbabddcoredata.hh b/src/tgba/tgbabddcoredata.hh
index 5c9c165b52cf0770aec76702fac8b24cc7169283..6e046954fd0d6fcefcf2f5b1ca93ef160c214e9c 100644
--- a/src/tgba/tgbabddcoredata.hh
+++ b/src/tgba/tgbabddcoredata.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBABDDCOREDATA_HH
 # define SPOT_TGBA_TGBABDDCOREDATA_HH
diff --git a/src/tgba/tgbabddfactory.hh b/src/tgba/tgbabddfactory.hh
index a4b609dc7e05c8d55604df35659af5033a571f5a..80c6393859e03419877b0535b247343cea3fbaa9 100644
--- a/src/tgba/tgbabddfactory.hh
+++ b/src/tgba/tgbabddfactory.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBABDDFACTORY_HH
 # define SPOT_TGBA_TGBABDDFACTORY_HH
diff --git a/src/tgba/tgbaexplicit.cc b/src/tgba/tgbaexplicit.cc
index 55f33937be97365aa97afbb344f68a560cc0a688..83109ae93d8741e5c35364fd31cdf7f2321f164e 100644
--- a/src/tgba/tgbaexplicit.cc
+++ b/src/tgba/tgbaexplicit.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgbaexplicit.hh"
 #include "ltlast/constant.hh"
diff --git a/src/tgba/tgbaexplicit.hh b/src/tgba/tgbaexplicit.hh
index ed875c417d8c7a7c6729b70a33ed234e5bb2b63b..077921c70fcfc757172b178b0849db06bf333307 100644
--- a/src/tgba/tgbaexplicit.hh
+++ b/src/tgba/tgbaexplicit.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBAEXPLICIT_HH
 # define SPOT_TGBA_TGBAEXPLICIT_HH
diff --git a/src/tgba/tgbakvcomplement.cc b/src/tgba/tgbakvcomplement.cc
index 29c20fec1c22641bbb4275bb61318a1d76e1fcb4..16cc6c147921e2d487c807455eb3e4bf9bcaab11 100644
--- a/src/tgba/tgbakvcomplement.cc
+++ b/src/tgba/tgbakvcomplement.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <vector>
 #include <cassert>
diff --git a/src/tgba/tgbakvcomplement.hh b/src/tgba/tgbakvcomplement.hh
index c40cdf1a85938c81180f88756eb7539d3a263c45..d514cb8a46b65b017e935b02cb8cfb98f258f6e6 100644
--- a/src/tgba/tgbakvcomplement.hh
+++ b/src/tgba/tgbakvcomplement.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBAKVCOMPLEMENT_HH
 #define SPOT_TGBA_TGBAKVCOMPLEMENT_HH
diff --git a/src/tgba/tgbaproduct.cc b/src/tgba/tgbaproduct.cc
index c0f79185193775e3ed5a9ccaf50074122ccad9e3..912b7ae5198b846fdc3724e0a620f021c75feaa2 100644
--- a/src/tgba/tgbaproduct.cc
+++ b/src/tgba/tgbaproduct.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgbaproduct.hh"
 #include <string>
diff --git a/src/tgba/tgbaproduct.hh b/src/tgba/tgbaproduct.hh
index e351c50a6d5bee9199456ffeaa5f739aab456e4c..284e9d65a5eccc366253398bcfd9a6b23ed8eaa0 100644
--- a/src/tgba/tgbaproduct.hh
+++ b/src/tgba/tgbaproduct.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBAPRODUCT_HH
 # define SPOT_TGBA_TGBAPRODUCT_HH
diff --git a/src/tgba/tgbasafracomplement.cc b/src/tgba/tgbasafracomplement.cc
index 493318c9752d6fc6f74553e1e8f84b06f0202aa9..efa9269374ffff0f4a637b79336ca23bef520883 100644
--- a/src/tgba/tgbasafracomplement.cc
+++ b/src/tgba/tgbasafracomplement.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <set>
 #include <map>
diff --git a/src/tgba/tgbasafracomplement.hh b/src/tgba/tgbasafracomplement.hh
index 8e80dedaebe53dda805a0b7dbd561aaf9370fc0d..299fc3d93273679702f7a9b0cd392a015417239f 100644
--- a/src/tgba/tgbasafracomplement.hh
+++ b/src/tgba/tgbasafracomplement.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBASAFRACOMPLEMENT_HH
 # define SPOT_TGBA_TGBASAFRACOMPLEMENT_HH
diff --git a/src/tgba/tgbascc.cc b/src/tgba/tgbascc.cc
index 770a57320d38f77ee2d30e512134a6a2ecab6c2e..4a13157aa69f957609c21a688a1f9728bbf9bdbb 100644
--- a/src/tgba/tgbascc.cc
+++ b/src/tgba/tgbascc.cc
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include "tgbascc.hh"
diff --git a/src/tgba/tgbascc.hh b/src/tgba/tgbascc.hh
index 4737cad1925fd938593a1c4a97d870a723c81bed..2c51a31b874877a0e2ddee28e0cbaa7ccd528619 100644
--- a/src/tgba/tgbascc.hh
+++ b/src/tgba/tgbascc.hh
@@ -4,7 +4,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -13,9 +13,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBASCC_HH
 # define SPOT_TGBA_TGBASCC_HH
diff --git a/src/tgba/tgbasgba.cc b/src/tgba/tgbasgba.cc
index cbdbb629e8835b30a76b66974585ad60b4182d2f..6cbbdecebcf74789c77852de24cf519fa5336f9b 100644
--- a/src/tgba/tgbasgba.cc
+++ b/src/tgba/tgbasgba.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "tgbasgba.hh"
diff --git a/src/tgba/tgbasgba.hh b/src/tgba/tgbasgba.hh
index 90f1f4935cdc836879f34b4b8e6d0922a652acc9..292fedbc19d6d242412245715cd5e1196de708e6 100644
--- a/src/tgba/tgbasgba.hh
+++ b/src/tgba/tgbasgba.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBASGBA_HH
 # define SPOT_TGBA_TGBASGBA_HH
diff --git a/src/tgba/tgbatba.cc b/src/tgba/tgbatba.cc
index 9f2bef2fea36f65e1cdbb8ea1f79780ef3a4939f..1a6ccace0c75855b19d4e6c7d8589198e8e85712 100644
--- a/src/tgba/tgbatba.cc
+++ b/src/tgba/tgbatba.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "tgbatba.hh"
diff --git a/src/tgba/tgbatba.hh b/src/tgba/tgbatba.hh
index 300b280dcf2be0980a93a044325b570a748a63bd..702c939789b7804060024d02a8a8ac1f0e063174 100644
--- a/src/tgba/tgbatba.hh
+++ b/src/tgba/tgbatba.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBATBA_HH
 # define SPOT_TGBA_TGBATBA_HH
diff --git a/src/tgba/tgbaunion.cc b/src/tgba/tgbaunion.cc
index 3089a3b0b6c9a5417018adc0b669a0b300529135..c1597462e259e4dd574044c2b6614b0efeb0950d 100644
--- a/src/tgba/tgbaunion.cc
+++ b/src/tgba/tgbaunion.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgbaunion.hh"
 #include <string>
diff --git a/src/tgba/tgbaunion.hh b/src/tgba/tgbaunion.hh
index 6f2201e833bdb60ca07cf008fbf88220eca5370a..ac2b3c3dfe760f364b07f8ade688efb0a13a7022 100644
--- a/src/tgba/tgbaunion.hh
+++ b/src/tgba/tgbaunion.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_TGBAUNION_HH
 # define SPOT_TGBA_TGBAUNION_HH
diff --git a/src/tgba/wdbacomp.cc b/src/tgba/wdbacomp.cc
index fe61419fc863c59561342944cf29b08f75966144..54e87af36b8afd752c5a3edc6de85cb05abf0eb2 100644
--- a/src/tgba/wdbacomp.cc
+++ b/src/tgba/wdbacomp.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "wdbacomp.hh"
 #include "ltlast/constant.hh"
diff --git a/src/tgba/wdbacomp.hh b/src/tgba/wdbacomp.hh
index e02999788834cde98385321592206bf4a7b5658a..f227bebffbc16a7153fa11e0317d85811e7b38e1 100644
--- a/src/tgba/wdbacomp.hh
+++ b/src/tgba/wdbacomp.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBA_WDBACOMP_HH
 # define SPOT_TGBA_WDBACOMP_HH
diff --git a/src/tgbaalgos/Makefile.am b/src/tgbaalgos/Makefile.am
index 51d4e67bb0c9dc21b97fb588153fde0be9cb01b1..963ec4a18b0493891f32c8cab0b1151f1e1dde39 100644
--- a/src/tgbaalgos/Makefile.am
+++ b/src/tgbaalgos/Makefile.am
@@ -9,7 +9,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = gtec
 
diff --git a/src/tgbaalgos/bfssteps.cc b/src/tgbaalgos/bfssteps.cc
index 056129c80e29c4c17976ef114c0cbc44e8ac77ec..0a5504f40737e2ce11629679c8a0885c9ccbf8b6 100644
--- a/src/tgbaalgos/bfssteps.cc
+++ b/src/tgbaalgos/bfssteps.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <deque>
 #include <utility>
diff --git a/src/tgbaalgos/bfssteps.hh b/src/tgbaalgos/bfssteps.hh
index 77b215b466af21e6312fd1dd97be16c0fe444b78..375be74d15f759deb5d8841aaa4c4845d5fe836f 100644
--- a/src/tgbaalgos/bfssteps.hh
+++ b/src/tgbaalgos/bfssteps.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_BFSSTEPS_HH
 # define SPOT_TGBAALGOS_BFSSTEPS_HH
diff --git a/src/tgbaalgos/cutscc.cc b/src/tgbaalgos/cutscc.cc
index 417604b96f236d66d9c2a5d7c8f752fda7aec2bb..b4bd28778511834ddade3ce78c7153bac7c8a0c1 100644
--- a/src/tgbaalgos/cutscc.cc
+++ b/src/tgbaalgos/cutscc.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <string>
diff --git a/src/tgbaalgos/cutscc.hh b/src/tgbaalgos/cutscc.hh
index ba0d0a3ec66b96598ec77ebcad10bc08482122a7..03dfb11ef2a5801c5260be2fc5a9b1cc0d97749a 100644
--- a/src/tgbaalgos/cutscc.hh
+++ b/src/tgbaalgos/cutscc.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_TGBAALGOS_CUTSCC_HH
diff --git a/src/tgbaalgos/cycles.cc b/src/tgbaalgos/cycles.cc
index 58be9c1a57bcbdc0b48e2a750331f5dc4b03dca6..4b52b743f9f54ca7f9e68a8816598a073758aeb3 100644
--- a/src/tgbaalgos/cycles.cc
+++ b/src/tgbaalgos/cycles.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "cycles.hh"
diff --git a/src/tgbaalgos/cycles.hh b/src/tgbaalgos/cycles.hh
index 2843553db78537417e8e786592097b24d56b524e..7398c891ff402228930da80e70b27b40c2be3bcc 100644
--- a/src/tgbaalgos/cycles.hh
+++ b/src/tgbaalgos/cycles.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_CYCLES_HH
 # define SPOT_TGBAALGOS_CYCLES_HH
diff --git a/src/tgbaalgos/degen.cc b/src/tgbaalgos/degen.cc
index 2cd2f5fd4bea17c8eafb084366878d0c5228f588..9a20052864154bd75efdec5cef18f1ee1d301ec8 100644
--- a/src/tgbaalgos/degen.cc
+++ b/src/tgbaalgos/degen.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #include "degen.hh"
diff --git a/src/tgbaalgos/degen.hh b/src/tgbaalgos/degen.hh
index 034dcc63ea9e1eb15ae312593af0885a4decd6eb..3757ad8ab5b28cea6439fa102ae486cb387804c4 100644
--- a/src/tgbaalgos/degen.hh
+++ b/src/tgbaalgos/degen.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_DEGEN_HH
 # define SPOT_TGBAALGOS_DEGEN_HH
diff --git a/src/tgbaalgos/dotty.cc b/src/tgbaalgos/dotty.cc
index 4b849b4533e00263dbf75713fea0c0fff57d6609..ec5636be24db6826926e15dd8d869365fa106253 100644
--- a/src/tgbaalgos/dotty.cc
+++ b/src/tgbaalgos/dotty.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "tgba/tgba.hh"
diff --git a/src/tgbaalgos/dotty.hh b/src/tgbaalgos/dotty.hh
index caeac0d61d73c79270c07de7a832484ebefb4195..6b14d2c8c36700c5cf3d7c396e5cba30b8835853 100644
--- a/src/tgbaalgos/dotty.hh
+++ b/src/tgbaalgos/dotty.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_DOTTY_HH
 # define SPOT_TGBAALGOS_DOTTY_HH
diff --git a/src/tgbaalgos/dottydec.cc b/src/tgbaalgos/dottydec.cc
index 955b2410b8632f43daf09f830b9f34cbd725ad92..110fe6b479650ad4d0e46db0c678aa2f0003ad5d 100644
--- a/src/tgbaalgos/dottydec.cc
+++ b/src/tgbaalgos/dottydec.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "dottydec.hh"
 #include "tgba/tgba.hh"
diff --git a/src/tgbaalgos/dottydec.hh b/src/tgbaalgos/dottydec.hh
index c3bdb4689c1a589a6648a6e3a94bdcca785f6c0f..78688bb137a1c0e310776115e9f3d6a9af8edce6 100644
--- a/src/tgbaalgos/dottydec.hh
+++ b/src/tgbaalgos/dottydec.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_DOTTYDEC_HH
 # define SPOT_TGBAALGOS_DOTTYDEC_HH
diff --git a/src/tgbaalgos/dupexp.cc b/src/tgbaalgos/dupexp.cc
index f71868eeab72f02ada76bfbd8c175e48628c2fbb..627069ab634dfe3d0991fdda51bc6c7d39b00353 100644
--- a/src/tgbaalgos/dupexp.cc
+++ b/src/tgbaalgos/dupexp.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "dupexp.hh"
 #include <sstream>
diff --git a/src/tgbaalgos/dupexp.hh b/src/tgbaalgos/dupexp.hh
index 40e8255e012bf82e6e0431328af7db6bd654bb0b..e735af26267e1027e1acda9289f3af77820578f2 100644
--- a/src/tgbaalgos/dupexp.hh
+++ b/src/tgbaalgos/dupexp.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_DUPEXP_HH
 # define SPOT_TGBAALGOS_DUPEXP_HH
diff --git a/src/tgbaalgos/eltl2tgba_lacim.cc b/src/tgbaalgos/eltl2tgba_lacim.cc
index e187dd00bf59d3db082829bcbc8a2b36410cb67e..ce44e06f42b3e5ec9a3efd70f8a00dc4374c5134 100644
--- a/src/tgbaalgos/eltl2tgba_lacim.cc
+++ b/src/tgbaalgos/eltl2tgba_lacim.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/visitor.hh"
 #include "ltlast/allnodes.hh"
diff --git a/src/tgbaalgos/eltl2tgba_lacim.hh b/src/tgbaalgos/eltl2tgba_lacim.hh
index 0c6c760aaefbf0db2f46cc02262d4c45be2de943..dbdfd0648b2cb88de3ba5b4646b771ff7eb2b93d 100644
--- a/src/tgbaalgos/eltl2tgba_lacim.hh
+++ b/src/tgbaalgos/eltl2tgba_lacim.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_ELTL2TGBA_LACIM_HH
 # define SPOT_TGBAALGOS_ELTL2TGBA_LACIM_HH
diff --git a/src/tgbaalgos/emptiness.cc b/src/tgbaalgos/emptiness.cc
index 0f001783131fbfbc807b2c05c9a10ab76e36f79c..2ed8cce5165054be4232f251333e133573535e2b 100644
--- a/src/tgbaalgos/emptiness.cc
+++ b/src/tgbaalgos/emptiness.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include "emptiness.hh"
diff --git a/src/tgbaalgos/emptiness.hh b/src/tgbaalgos/emptiness.hh
index 30375fb14025a020f8b6ca1c51d7369f0f2dbbd9..04a9538c034f9598cbb5653390d303b5ba6797c4 100644
--- a/src/tgbaalgos/emptiness.hh
+++ b/src/tgbaalgos/emptiness.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_EMPTINESS_HH
 # define SPOT_TGBAALGOS_EMPTINESS_HH
diff --git a/src/tgbaalgos/emptiness_stats.hh b/src/tgbaalgos/emptiness_stats.hh
index 1d396517ab82b4434f8d2278ec517ddb709b3082..cf93ac6f6296d5ed15fdd1ba3f27c648ac5de487 100644
--- a/src/tgbaalgos/emptiness_stats.hh
+++ b/src/tgbaalgos/emptiness_stats.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_EMPTINESS_STATS_HH
 # define SPOT_TGBAALGOS_EMPTINESS_STATS_HH
diff --git a/src/tgbaalgos/gtec/Makefile.am b/src/tgbaalgos/gtec/Makefile.am
index 790c0a7cb876e7ada99cd8028722e87d8041c29f..2c33afb5a22808af4f5ed482adcb519a5c6d5d43 100644
--- a/src/tgbaalgos/gtec/Makefile.am
+++ b/src/tgbaalgos/gtec/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/../.. -I../.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/tgbaalgos/gtec/ce.cc b/src/tgbaalgos/gtec/ce.cc
index 89707dd12a2f9c1d356faa9293daf0f831be549e..497c72674c0929a8f84ceb02b95682743d425c09 100644
--- a/src/tgbaalgos/gtec/ce.cc
+++ b/src/tgbaalgos/gtec/ce.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ce.hh"
 #include "tgbaalgos/bfssteps.hh"
diff --git a/src/tgbaalgos/gtec/ce.hh b/src/tgbaalgos/gtec/ce.hh
index 255ef39ae33271204eabf8b90a7a9eb2e4c32415..171f91e07bf31b6adf16d1dccc0bf1a37432d4b4 100644
--- a/src/tgbaalgos/gtec/ce.hh
+++ b/src/tgbaalgos/gtec/ce.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GTEC_CE_HH
 # define SPOT_TGBAALGOS_GTEC_CE_HH
diff --git a/src/tgbaalgos/gtec/explscc.cc b/src/tgbaalgos/gtec/explscc.cc
index 09a6114cdc020bf7c9cc5ee84e8232167fa05d39..c489d00341d993279ab7f9c678248815c086acd7 100644
--- a/src/tgbaalgos/gtec/explscc.cc
+++ b/src/tgbaalgos/gtec/explscc.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "explscc.hh"
 
diff --git a/src/tgbaalgos/gtec/explscc.hh b/src/tgbaalgos/gtec/explscc.hh
index e67b8b475e59ed29722518d0288232fd6d0f1e73..57b17cdd012d6e1e305a8537904666918d701036 100644
--- a/src/tgbaalgos/gtec/explscc.hh
+++ b/src/tgbaalgos/gtec/explscc.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GTEC_EXPLSCC_HH
 # define SPOT_TGBAALGOS_GTEC_EXPLSCC_HH
diff --git a/src/tgbaalgos/gtec/gtec.cc b/src/tgbaalgos/gtec/gtec.cc
index 7f48d2ec28b3543c63c171f5106df08285258110..0b8621af79e7161c68a0c83bb371caf010ce11d4 100644
--- a/src/tgbaalgos/gtec/gtec.cc
+++ b/src/tgbaalgos/gtec/gtec.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define TRACE
 
diff --git a/src/tgbaalgos/gtec/gtec.hh b/src/tgbaalgos/gtec/gtec.hh
index 3055b12735419932aaffc8f5c9d3867e7f360cdd..a57adb7fa101370ea05482e3b60c5415d36cf4fe 100644
--- a/src/tgbaalgos/gtec/gtec.hh
+++ b/src/tgbaalgos/gtec/gtec.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GTEC_GTEC_HH
 # define SPOT_TGBAALGOS_GTEC_GTEC_HH
diff --git a/src/tgbaalgos/gtec/nsheap.cc b/src/tgbaalgos/gtec/nsheap.cc
index 0fbef7b5af391d35ae35903cbfc61d826a6f6316..ff615ba459f9bdcc2bd64d69c2aaaebe2636cdba 100644
--- a/src/tgbaalgos/gtec/nsheap.cc
+++ b/src/tgbaalgos/gtec/nsheap.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "nsheap.hh"
 
diff --git a/src/tgbaalgos/gtec/nsheap.hh b/src/tgbaalgos/gtec/nsheap.hh
index 509d0ef3c86b84afc72dbbff8c20e6ecde6e21d3..fa640cae6db8d5ad3ddea5795b0a7ad914fa3bec 100644
--- a/src/tgbaalgos/gtec/nsheap.hh
+++ b/src/tgbaalgos/gtec/nsheap.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GTEC_NSHEAP_HH
 # define SPOT_TGBAALGOS_GTEC_NSHEAP_HH
diff --git a/src/tgbaalgos/gtec/sccstack.cc b/src/tgbaalgos/gtec/sccstack.cc
index aef399679bf01a891ee22eb6a6d12d4cbbba1f96..7ffdbed5514df29cdc49a3ab8a0af5e10da1cdf0 100644
--- a/src/tgbaalgos/gtec/sccstack.cc
+++ b/src/tgbaalgos/gtec/sccstack.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "sccstack.hh"
 
diff --git a/src/tgbaalgos/gtec/sccstack.hh b/src/tgbaalgos/gtec/sccstack.hh
index 56d50c240a52fdb3f619563aeb0054c689dc3872..04520acc9fb7a7195eb0c21d80ea4b832c1c28c1 100644
--- a/src/tgbaalgos/gtec/sccstack.hh
+++ b/src/tgbaalgos/gtec/sccstack.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GTEC_SCCSTACK_HH
 # define SPOT_TGBAALGOS_GTEC_SCCSTACK_HH
diff --git a/src/tgbaalgos/gtec/status.cc b/src/tgbaalgos/gtec/status.cc
index ce741bf472c9abb4ec0091e181af80ff8581367f..f7ec41ea8d0dc13d183eaa719b821c73044ec488 100644
--- a/src/tgbaalgos/gtec/status.cc
+++ b/src/tgbaalgos/gtec/status.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "status.hh"
diff --git a/src/tgbaalgos/gtec/status.hh b/src/tgbaalgos/gtec/status.hh
index 1337fcbd618f198fa10eb3cccf2cb5b7af2d88a9..69f4ce583e74d309bbe241aa364b6b33494c3818 100644
--- a/src/tgbaalgos/gtec/status.hh
+++ b/src/tgbaalgos/gtec/status.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GTEC_STATUS_HH
 # define SPOT_TGBAALGOS_GTEC_STATUS_HH
diff --git a/src/tgbaalgos/gv04.cc b/src/tgbaalgos/gv04.cc
index f9d216ca4dc5e5597dd6d31e096456f9a9fa98a1..2f285860e1910507989e188fd920487978d8e7e6 100644
--- a/src/tgbaalgos/gv04.cc
+++ b/src/tgbaalgos/gv04.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define TRACE
 
diff --git a/src/tgbaalgos/gv04.hh b/src/tgbaalgos/gv04.hh
index a38d5c61fffd97ee586143c0b5b87b37d70907e7..e971bd38066b0b2a91ea6ed01836e88058ab30bb 100644
--- a/src/tgbaalgos/gv04.hh
+++ b/src/tgbaalgos/gv04.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_GV04_HH
 # define SPOT_TGBAALGOS_GV04_HH
diff --git a/src/tgbaalgos/isdet.cc b/src/tgbaalgos/isdet.cc
index d9ca3b0eb7c83e36f2303b5cdef24e9029e8be87..367f1e1f01aa77739fc7e0561c722c4c2ef64806 100644
--- a/src/tgbaalgos/isdet.cc
+++ b/src/tgbaalgos/isdet.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "tgbaalgos/isdet.hh"
 #include <set>
diff --git a/src/tgbaalgos/isdet.hh b/src/tgbaalgos/isdet.hh
index 3a602d173fdc6745cfd29fc846ce59463963c375..8f9c7b79f195933a4ec95d03cf0813c7f2c8177c 100644
--- a/src/tgbaalgos/isdet.hh
+++ b/src/tgbaalgos/isdet.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_ISDET_HH
 # define SPOT_TGBAALGOS_ISDET_HH
diff --git a/src/tgbaalgos/isweakscc.cc b/src/tgbaalgos/isweakscc.cc
index 8e1593cda759e5943ec900fb4c72ce1eebb2e3a2..acb2f3151db351e9b46a2922c788311c1eca5e2d 100644
--- a/src/tgbaalgos/isweakscc.cc
+++ b/src/tgbaalgos/isweakscc.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_ISWEAKSCC_CC
 # define SPOT_TGBAALGOS_ISWEAKSCC_CC
diff --git a/src/tgbaalgos/isweakscc.hh b/src/tgbaalgos/isweakscc.hh
index 83d195e7823a6bc1243472a24007bea5b9ca91e7..6eb196e83ce5925f8f3cb39dfbec41d1d99ce179 100644
--- a/src/tgbaalgos/isweakscc.hh
+++ b/src/tgbaalgos/isweakscc.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_ISWEAKSCC_HH
 # define SPOT_TGBAALGOS_ISWEAKSCC_HH
diff --git a/src/tgbaalgos/lbtt.cc b/src/tgbaalgos/lbtt.cc
index 7525554f8c1ab7be065b247ebfc5fa08dabdc9b5..88849b48237e642be82d489e37201876e0604e82 100644
--- a/src/tgbaalgos/lbtt.cc
+++ b/src/tgbaalgos/lbtt.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "lbtt.hh"
 #include <map>
diff --git a/src/tgbaalgos/lbtt.hh b/src/tgbaalgos/lbtt.hh
index d47a4694666149db3ed9c8dfdf082b4b39dbbd70..b3812556715b24a5402585e8150692d7e91d15f4 100644
--- a/src/tgbaalgos/lbtt.hh
+++ b/src/tgbaalgos/lbtt.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_LBTT_HH
 # define SPOT_TGBAALGOS_LBTT_HH
diff --git a/src/tgbaalgos/ltl2taa.cc b/src/tgbaalgos/ltl2taa.cc
index 2722c8365ff7dbfe9c513b2d2deda73703aeea47..bbe806681bf2838cec2b3c996e9192ab0a913d5f 100644
--- a/src/tgbaalgos/ltl2taa.cc
+++ b/src/tgbaalgos/ltl2taa.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <utility>
 #include "ltlast/visitor.hh"
diff --git a/src/tgbaalgos/ltl2taa.hh b/src/tgbaalgos/ltl2taa.hh
index 7f23658f1fb001b8e413f7ea8a54fcfb225d7f0a..080fdf1551ae0d0133f520d4e4ce2923f4c39646 100644
--- a/src/tgbaalgos/ltl2taa.hh
+++ b/src/tgbaalgos/ltl2taa.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_LTL2TAA_HH
 # define SPOT_TGBAALGOS_LTL2TAA_HH
diff --git a/src/tgbaalgos/ltl2tgba_fm.cc b/src/tgbaalgos/ltl2tgba_fm.cc
index b76b92f6bd6b9a7902b915582c7c4af626e5829a..dd42f498ac8b49eb4a97c39ebedbf7a4f234743f 100644
--- a/src/tgbaalgos/ltl2tgba_fm.cc
+++ b/src/tgbaalgos/ltl2tgba_fm.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "misc/hash.hh"
 #include "misc/bddalloc.hh"
diff --git a/src/tgbaalgos/ltl2tgba_fm.hh b/src/tgbaalgos/ltl2tgba_fm.hh
index cfa82ec1809e564d9a1930bcc56a3eb68bfcf66a..1550958635f83fd6a3662fa024316c8a925abdf2 100644
--- a/src/tgbaalgos/ltl2tgba_fm.hh
+++ b/src/tgbaalgos/ltl2tgba_fm.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_LTL2TGBA_FM_HH
 # define SPOT_TGBAALGOS_LTL2TGBA_FM_HH
diff --git a/src/tgbaalgos/ltl2tgba_lacim.cc b/src/tgbaalgos/ltl2tgba_lacim.cc
index e30403448cf07b12e7c212e40fbcfbcfd365e999..17d8671a7a0536554e7cd58c48e454821815b623 100644
--- a/src/tgbaalgos/ltl2tgba_lacim.cc
+++ b/src/tgbaalgos/ltl2tgba_lacim.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "ltlast/visitor.hh"
 #include "ltlast/allnodes.hh"
diff --git a/src/tgbaalgos/ltl2tgba_lacim.hh b/src/tgbaalgos/ltl2tgba_lacim.hh
index c5b0b4b3fd1203b0a7f7134cafd2af8afc14a43e..6c4436dd4cdb31e4fefdaadd0775a64c5ae5410e 100644
--- a/src/tgbaalgos/ltl2tgba_lacim.hh
+++ b/src/tgbaalgos/ltl2tgba_lacim.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_LTL2TGBA_LACIM_HH
 # define SPOT_TGBAALGOS_LTL2TGBA_LACIM_HH
diff --git a/src/tgbaalgos/magic.cc b/src/tgbaalgos/magic.cc
index bd4d4cbcac3e003f0f5f2fa1955bd893f62d48c7..ade8fea2078f750a6fcc703dcc25e948f4053bc9 100644
--- a/src/tgbaalgos/magic.cc
+++ b/src/tgbaalgos/magic.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define TRACE
 
diff --git a/src/tgbaalgos/magic.hh b/src/tgbaalgos/magic.hh
index 9b2a7f547ec03c4b80a2b4036135c2cb71fc437c..e44522b8ec9cb1412e2d85b58ded3831b16187d3 100644
--- a/src/tgbaalgos/magic.hh
+++ b/src/tgbaalgos/magic.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_MAGIC_HH
 # define SPOT_TGBAALGOS_MAGIC_HH
diff --git a/src/tgbaalgos/minimize.cc b/src/tgbaalgos/minimize.cc
index f914b148bad71eaf0fd77f889369fef6cdda7113..3df72d895c498822f577a916b67663221d01fe18 100644
--- a/src/tgbaalgos/minimize.cc
+++ b/src/tgbaalgos/minimize.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 //#define TRACE
diff --git a/src/tgbaalgos/minimize.hh b/src/tgbaalgos/minimize.hh
index be4f4f2d6cfa2a0f3cb0a39fbcc348395d87e07d..d6b67f649d599942705873984d193c4a5e6e9a66 100644
--- a/src/tgbaalgos/minimize.hh
+++ b/src/tgbaalgos/minimize.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_MINIMIZE_HH
 # define SPOT_TGBAALGOS_MINIMIZE_HH
diff --git a/src/tgbaalgos/ndfs_result.hxx b/src/tgbaalgos/ndfs_result.hxx
index 560558d12c025f49a4fa3af63b13739cfb28f954..579cc2e18b599ff591aacdc8be6ccd173631342a 100644
--- a/src/tgbaalgos/ndfs_result.hxx
+++ b/src/tgbaalgos/ndfs_result.hxx
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_NDFS_RESULT_HXX
 # define SPOT_TGBAALGOS_NDFS_RESULT_HXX
diff --git a/src/tgbaalgos/neverclaim.cc b/src/tgbaalgos/neverclaim.cc
index 0703474962dbcdcba38fbab8626874ce374bd180..42cb531407e33a1af8e6e83d806dc6f8b40f8234 100644
--- a/src/tgbaalgos/neverclaim.cc
+++ b/src/tgbaalgos/neverclaim.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include <sstream>
diff --git a/src/tgbaalgos/neverclaim.hh b/src/tgbaalgos/neverclaim.hh
index 1c55e289837076d74372cde524b3389c311f4377..27a5ac7f10aa8b8d4e6041f16dd2de139e4ff372 100644
--- a/src/tgbaalgos/neverclaim.hh
+++ b/src/tgbaalgos/neverclaim.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_NEVERCLAIM_HH
 # define SPOT_TGBAALGOS_NEVERCLAIM_HH
diff --git a/src/tgbaalgos/postproc.cc b/src/tgbaalgos/postproc.cc
index 5e8441280f4dadff4ed75cbbf97e235bdbb391ab..31ffb658eb806484063988df190e2eec0787978a 100644
--- a/src/tgbaalgos/postproc.cc
+++ b/src/tgbaalgos/postproc.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "postproc.hh"
 #include "minimize.hh"
diff --git a/src/tgbaalgos/postproc.hh b/src/tgbaalgos/postproc.hh
index 8adbc16ce5ef2b903c28b1591d59c26163775b31..8c8f1093fd2439d498c0633f6cd5279c8d2e06b1 100644
--- a/src/tgbaalgos/postproc.hh
+++ b/src/tgbaalgos/postproc.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_POSTPROC_HH
 # define SPOT_TGBAALGOS_POSTPROC_HH
diff --git a/src/tgbaalgos/powerset.cc b/src/tgbaalgos/powerset.cc
index a93bb487f60e86de1c88320a2dbfbc8acfc730b9..1f5bb6edd05b575d756f54545b352380c57c7745 100644
--- a/src/tgbaalgos/powerset.cc
+++ b/src/tgbaalgos/powerset.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <set>
 #include <deque>
diff --git a/src/tgbaalgos/powerset.hh b/src/tgbaalgos/powerset.hh
index b1142351a40c3975d80de5300dedd45747f08919..eec3e613b5b8f5cd9f795ab915686c9e012e02cc 100644
--- a/src/tgbaalgos/powerset.hh
+++ b/src/tgbaalgos/powerset.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_POWERSET_HH
 # define SPOT_TGBAALGOS_POWERSET_HH
diff --git a/src/tgbaalgos/projrun.cc b/src/tgbaalgos/projrun.cc
index 99cdae61f6aebb4d56039ededea29053623e5d00..75070cd85e1112bb365447328550c7383edf7ade 100644
--- a/src/tgbaalgos/projrun.cc
+++ b/src/tgbaalgos/projrun.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "projrun.hh"
 #include "tgba/tgba.hh"
diff --git a/src/tgbaalgos/projrun.hh b/src/tgbaalgos/projrun.hh
index 80dbc014d8eb5a33f2e6d950838575818dbfe8dd..a54bd4d6bc68ae35b91b6cf8345fe8ce49b22d7d 100644
--- a/src/tgbaalgos/projrun.hh
+++ b/src/tgbaalgos/projrun.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_PROJRUN_HH
 # define SPOT_TGBAALGOS_PROJRUN_HH
diff --git a/src/tgbaalgos/randomgraph.cc b/src/tgbaalgos/randomgraph.cc
index 00be4b4950364db5046df3f113a5dc8fac3dba46..6972bd72a11a5c2432a15f8110f1391c22bf14e1 100644
--- a/src/tgbaalgos/randomgraph.cc
+++ b/src/tgbaalgos/randomgraph.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "randomgraph.hh"
 #include "tgba/tgbaexplicit.hh"
diff --git a/src/tgbaalgos/randomgraph.hh b/src/tgbaalgos/randomgraph.hh
index 11841eabd22adacabc4b2e63bdc088206e682d38..32e0cc208322d3965edab4017ae0555e31eac197 100644
--- a/src/tgbaalgos/randomgraph.hh
+++ b/src/tgbaalgos/randomgraph.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_RANDOMGRAPH_HH
 # define SPOT_TGBAALGOS_RANDOMGRAPH_HH
diff --git a/src/tgbaalgos/reachiter.cc b/src/tgbaalgos/reachiter.cc
index d386e798589b497b461e0a5c2bdc426584143301..0a9e7c6df4373b17a8ed430784df4a47d2ca0626 100644
--- a/src/tgbaalgos/reachiter.cc
+++ b/src/tgbaalgos/reachiter.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include "reachiter.hh"
diff --git a/src/tgbaalgos/reachiter.hh b/src/tgbaalgos/reachiter.hh
index f077db0bd6ee6ef866788c7e23d3469888c822e0..2977c63e96eb803a667818cbd7b26d22611ec45e 100644
--- a/src/tgbaalgos/reachiter.hh
+++ b/src/tgbaalgos/reachiter.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_REACHITER_HH
 # define SPOT_TGBAALGOS_REACHITER_HH
diff --git a/src/tgbaalgos/reducerun.cc b/src/tgbaalgos/reducerun.cc
index e218af74121836b9660f39baf563277e119bb73f..ec04e5b9c2399eb50e3782efc0481f865eeb1f50 100644
--- a/src/tgbaalgos/reducerun.cc
+++ b/src/tgbaalgos/reducerun.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "misc/hash.hh"
 #include "emptiness.hh"
diff --git a/src/tgbaalgos/reducerun.hh b/src/tgbaalgos/reducerun.hh
index 155998e2170e72352bfae4a195a3e128c0353943..2f70fd5c3b5d25f61cb22c1bff3d0d654325e5c6 100644
--- a/src/tgbaalgos/reducerun.hh
+++ b/src/tgbaalgos/reducerun.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_REDUCERUN_HH
 # define SPOT_TGBAALGOS_REDUCERUN_HH
diff --git a/src/tgbaalgos/reductgba_sim.cc b/src/tgbaalgos/reductgba_sim.cc
index f99e0993e5a0dc254dae2f82a16087c3c78b9f3b..84279c786dd74d8111f1c84840f24d1a457c9020 100644
--- a/src/tgbaalgos/reductgba_sim.cc
+++ b/src/tgbaalgos/reductgba_sim.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "reductgba_sim.hh"
 #include "sccfilter.hh"
diff --git a/src/tgbaalgos/reductgba_sim.hh b/src/tgbaalgos/reductgba_sim.hh
index 8d9c3bc4594526264062cb3de2ea9110c9547cf8..bac013ae96d7f3f89be61219d6655f2947eb8055 100644
--- a/src/tgbaalgos/reductgba_sim.hh
+++ b/src/tgbaalgos/reductgba_sim.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 #ifndef SPOT_TGBAALGOS_REDUCTGBA_SIM_HH
diff --git a/src/tgbaalgos/replayrun.cc b/src/tgbaalgos/replayrun.cc
index fefae932df6e459fbe93769904412d081dc23cd2..f452825c287fbf04a742176154fbe08b17b45c1c 100644
--- a/src/tgbaalgos/replayrun.cc
+++ b/src/tgbaalgos/replayrun.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "misc/hash.hh"
 #include "replayrun.hh"
diff --git a/src/tgbaalgos/replayrun.hh b/src/tgbaalgos/replayrun.hh
index da78ab4149392b8695fba6cdd309e68b5ba54315..0d19c48c2b84725c0f98b78be50a7e7ee7a47643 100644
--- a/src/tgbaalgos/replayrun.hh
+++ b/src/tgbaalgos/replayrun.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_REPLAYRUN_HH
 # define SPOT_TGBAALGOS_REPLAYRUN_HH
diff --git a/src/tgbaalgos/rundotdec.cc b/src/tgbaalgos/rundotdec.cc
index 340397ab51b83a538edd8b36fda0e1e90ed0c2cf..23a4d57780fed6ff33c3cc1c938e4b22124ebd76 100644
--- a/src/tgbaalgos/rundotdec.cc
+++ b/src/tgbaalgos/rundotdec.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <sstream>
 #include "rundotdec.hh"
diff --git a/src/tgbaalgos/rundotdec.hh b/src/tgbaalgos/rundotdec.hh
index bdabc791c84488327a80bc9c8e7ee88214a9cc8f..c6b2770c5280baf695c49af6d875e5f4969faf31 100644
--- a/src/tgbaalgos/rundotdec.hh
+++ b/src/tgbaalgos/rundotdec.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_RUNDOTDEC_HH
 # define SPOT_TGBAALGOS_RUNDOTDEC_HH
diff --git a/src/tgbaalgos/safety.cc b/src/tgbaalgos/safety.cc
index c04b65d1ce2b3be2cdafdbef7323ab9d4f2dee72..2c0f70570b7b835dd7c0822b901ad7b08889ff6d 100644
--- a/src/tgbaalgos/safety.cc
+++ b/src/tgbaalgos/safety.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "safety.hh"
 #include "misc/hash.hh"
diff --git a/src/tgbaalgos/safety.hh b/src/tgbaalgos/safety.hh
index c7e02a4d6aa12d4c14574633b957e54df697bfe0..a66fd6aa10265959a05bdee2415051a463c58e44 100644
--- a/src/tgbaalgos/safety.hh
+++ b/src/tgbaalgos/safety.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_SAFETY_HH
 # define SPOT_TGBAALGOS_SAFETY_HH
diff --git a/src/tgbaalgos/save.cc b/src/tgbaalgos/save.cc
index 320cebfafa459edadea94e66f409f2ad43219990..c0f3287184f2501de0b1f3203b69ffe8a54edcc9 100644
--- a/src/tgbaalgos/save.cc
+++ b/src/tgbaalgos/save.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "save.hh"
diff --git a/src/tgbaalgos/save.hh b/src/tgbaalgos/save.hh
index 98b7960634f4440863098e71660936f04953ee2d..cc37022af60c5e0564206ad419fdc39e89a817ab 100644
--- a/src/tgbaalgos/save.hh
+++ b/src/tgbaalgos/save.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_SAVE_HH
 # define SPOT_TGBAALGOS_SAVE_HH
diff --git a/src/tgbaalgos/scc.cc b/src/tgbaalgos/scc.cc
index 0f707d92d3792095ea196d9c1b0d5d1dd4fef58d..efcd5455292cdf0eea6a0abb2a135380dd1eccbf 100644
--- a/src/tgbaalgos/scc.cc
+++ b/src/tgbaalgos/scc.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <queue>
 #include <set>
diff --git a/src/tgbaalgos/scc.hh b/src/tgbaalgos/scc.hh
index 3525d25eff6a2e7c03d1e5f65a87028d1bc6623f..976c2d6c338a815ef2740294582e3d5469c80a99 100644
--- a/src/tgbaalgos/scc.hh
+++ b/src/tgbaalgos/scc.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_SCC_HH
 # define SPOT_TGBAALGOS_SCC_HH
diff --git a/src/tgbaalgos/sccfilter.cc b/src/tgbaalgos/sccfilter.cc
index 997f5684173f56e8ba48f9aae162b790324bbd79..0df1a8b8a425901d961a5589648513071dbfa09d 100644
--- a/src/tgbaalgos/sccfilter.cc
+++ b/src/tgbaalgos/sccfilter.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "sccfilter.hh"
 #include "tgba/tgbaexplicit.hh"
diff --git a/src/tgbaalgos/sccfilter.hh b/src/tgbaalgos/sccfilter.hh
index af3bee0c1f40de5247a407348e4a4d0525020380..fa4503b9a80876ba01225cdfb0b357b70fa15679 100644
--- a/src/tgbaalgos/sccfilter.hh
+++ b/src/tgbaalgos/sccfilter.hh
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_SCCFILTER_HH
 # define SPOT_TGBAALGOS_SCCFILTER_HH
diff --git a/src/tgbaalgos/se05.cc b/src/tgbaalgos/se05.cc
index 13605aae9340ed7fe989e910179b3eb3cedd80c4..ce73a04ca5bf1b35a5cd9153ef407b81183a7337 100644
--- a/src/tgbaalgos/se05.cc
+++ b/src/tgbaalgos/se05.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define TRACE
 
diff --git a/src/tgbaalgos/se05.hh b/src/tgbaalgos/se05.hh
index e64e458eb6c527835144d04bfb28b41dd88ae7a4..8d61034107c2338f00bf4dd8a3c795c564a079ca 100644
--- a/src/tgbaalgos/se05.hh
+++ b/src/tgbaalgos/se05.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_SE05_HH
 # define SPOT_TGBAALGOS_SE05_HH
diff --git a/src/tgbaalgos/simulation.cc b/src/tgbaalgos/simulation.cc
index a2094276b72736e14d44ed6a31b9ced829e02cdd..381cf105f2dfdb82ba28e3334d2b183d0ff3e66f 100644
--- a/src/tgbaalgos/simulation.cc
+++ b/src/tgbaalgos/simulation.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <queue>
 #include <map>
diff --git a/src/tgbaalgos/simulation.hh b/src/tgbaalgos/simulation.hh
index e2b3c1e2ea668a07f8916c9b5e7fc8e0a3ec007e..0e8af58075d28d8ee3a19663b2bfe307fc43f54e 100644
--- a/src/tgbaalgos/simulation.hh
+++ b/src/tgbaalgos/simulation.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_SIMULATION_HH
 # define SPOT_TGBAALGOS_SIMULATION_HH
diff --git a/src/tgbaalgos/stats.cc b/src/tgbaalgos/stats.cc
index 535b7c5cb0feb0e544858c567f785ba3e2be4dc2..a5f43fcee051b79e54765e1a3b4a31201f14a80b 100644
--- a/src/tgbaalgos/stats.cc
+++ b/src/tgbaalgos/stats.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "tgba/tgba.hh"
diff --git a/src/tgbaalgos/stats.hh b/src/tgbaalgos/stats.hh
index b7b3c2a8e2011851fe57062986d996459bd9d254..654c05a9b77dc2cff385fa8feeb03f33e8f9b7fa 100644
--- a/src/tgbaalgos/stats.hh
+++ b/src/tgbaalgos/stats.hh
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_STATS_HH
 # define SPOT_TGBAALGOS_STATS_HH
diff --git a/src/tgbaalgos/tau03.cc b/src/tgbaalgos/tau03.cc
index 9ed5bf7b57460754c924c3eb3c5a81c595be6d2a..5aa450d44632c6ef521371813af157487b4830a7 100644
--- a/src/tgbaalgos/tau03.cc
+++ b/src/tgbaalgos/tau03.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// FIXME: Add
 /// - a bit-state hashing version.
diff --git a/src/tgbaalgos/tau03.hh b/src/tgbaalgos/tau03.hh
index ba96cdb27956227c36356aa309e131bdc0868659..26ec881bf641a9ed1c4d8b853edf4f7c82db06ca 100644
--- a/src/tgbaalgos/tau03.hh
+++ b/src/tgbaalgos/tau03.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_TAU03_HH
 # define SPOT_TGBAALGOS_TAU03_HH
diff --git a/src/tgbaalgos/tau03opt.cc b/src/tgbaalgos/tau03opt.cc
index 1546f34315851b00bf70213adc55a47b190be854..4eac6e0d60acab3f2ae59cb949d05cd5d531cc25 100644
--- a/src/tgbaalgos/tau03opt.cc
+++ b/src/tgbaalgos/tau03opt.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /// FIXME:
 /// * Test some heuristics on the order of visit of the successors in the blue
diff --git a/src/tgbaalgos/tau03opt.hh b/src/tgbaalgos/tau03opt.hh
index 3171bee154f1f7e346b712a6f1cc282aa7e64ef6..57e4899cb51bed8cf870c17fe329a2cc92d71e38 100644
--- a/src/tgbaalgos/tau03opt.hh
+++ b/src/tgbaalgos/tau03opt.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_TAU03OPT_HH
 # define SPOT_TGBAALGOS_TAU03OPT_HH
diff --git a/src/tgbaalgos/weight.cc b/src/tgbaalgos/weight.cc
index c2a467b89e4085487475792e9c0082e5e103b63c..285713febb7a2cd01f744eb71b3af8768fb909a5 100644
--- a/src/tgbaalgos/weight.cc
+++ b/src/tgbaalgos/weight.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <ostream>
diff --git a/src/tgbaalgos/weight.hh b/src/tgbaalgos/weight.hh
index 4ec52f29ed634f8586ce0ffc02da35a9bbf1ce44..525ced54c5e915eaf61573fab65afd8d2e4d8029 100644
--- a/src/tgbaalgos/weight.hh
+++ b/src/tgbaalgos/weight.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAALGOS_WEIGHT_HH
 # define SPOT_TGBAALGOS_WEIGHT_HH
diff --git a/src/tgbaparse/Makefile.am b/src/tgbaparse/Makefile.am
index 2011375b0ee4cc3b60fc751b3ce91bd95ef067d8..2b40c4b1f8474afecf836bd34981b3fdf5e8e116 100644
--- a/src/tgbaparse/Makefile.am
+++ b/src/tgbaparse/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS) -DYY_NO_INPUT
 # Disable -Werror because too many versions of flex yield warnings.
diff --git a/src/tgbaparse/fmterror.cc b/src/tgbaparse/fmterror.cc
index 09ca5fb8f12cfbf6967c3414106af6dee7179f0d..5a8a19f390d328605fa13d6c104b3806b5ffed8e 100644
--- a/src/tgbaparse/fmterror.cc
+++ b/src/tgbaparse/fmterror.cc
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <ostream>
 #include "public.hh"
diff --git a/src/tgbaparse/parsedecl.hh b/src/tgbaparse/parsedecl.hh
index dc51f75ed15050af14276126663de7d90b903e3f..2517ae37df1d51e9ff73a47ff6f6cecf7932324a 100644
--- a/src/tgbaparse/parsedecl.hh
+++ b/src/tgbaparse/parsedecl.hh
@@ -6,7 +6,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAPARSE_PARSEDECL_HH
 # define SPOT_TGBAPARSE_PARSEDECL_HH
diff --git a/src/tgbaparse/public.hh b/src/tgbaparse/public.hh
index c15595c4f6f9aca5c1f175d4128648b77c21f39b..2b95d2c7d064de770a451df9f8cbf511df8021bb 100644
--- a/src/tgbaparse/public.hh
+++ b/src/tgbaparse/public.hh
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef SPOT_TGBAPARSE_PUBLIC_HH
 # define SPOT_TGBAPARSE_PUBLIC_HH
diff --git a/src/tgbaparse/tgbaparse.yy b/src/tgbaparse/tgbaparse.yy
index da4517c59cf31238e7625cc8413dcdda9d03aa78..13da43fcd8fd2bffdf090b51824fe9039d60ccb0 100644
--- a/src/tgbaparse/tgbaparse.yy
+++ b/src/tgbaparse/tgbaparse.yy
@@ -9,7 +9,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %language "C++"
 %locations
diff --git a/src/tgbaparse/tgbascan.ll b/src/tgbaparse/tgbascan.ll
index cda637ebc9f2b83384eaebded8d2f965ab9de935..83c055e4d2e8faf68a261c93df63a9894c045a17 100644
--- a/src/tgbaparse/tgbascan.ll
+++ b/src/tgbaparse/tgbascan.ll
@@ -8,7 +8,7 @@
 **
 ** Spot is free software; you can redistribute it and/or modify it
 ** under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation; either version 3 of the License, or
 ** (at your option) any later version.
 **
 ** Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ** License for more details.
 **
 ** You should have received a copy of the GNU General Public License
-** along with Spot; see the file COPYING.  If not, write to the Free
-** Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-** 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 %option noyywrap
 %option prefix="tgbayy"
diff --git a/src/tgbatest/Makefile.am b/src/tgbatest/Makefile.am
index 3ddfa30f66cb2d052b1c45b9072680354c54aa4a..c5c3356c5584c5182be2dcf7515d3fad2a4b502d 100644
--- a/src/tgbatest/Makefile.am
+++ b/src/tgbatest/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CPPFLAGS = -I$(srcdir)/.. -I.. $(BUDDY_CPPFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
diff --git a/src/tgbatest/babiak.test b/src/tgbatest/babiak.test
index 3d848b838f88c96bb1a81545bc6f8ead2bedd4e1..dfcdab0a4f4c9350a4e5569efd1ae2888252632f 100755
--- a/src/tgbatest/babiak.test
+++ b/src/tgbatest/babiak.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # While running some benchmark, Tomáš Babiak found that Spot took too
 # much time (i.e. >1h) to translate those six formulae.  It turns out
diff --git a/src/tgbatest/bddprod.test b/src/tgbatest/bddprod.test
index 056aac7cf2c7405018d987983d44ae2e6b540c8e..c01a7da743be59860a9b059ee38f6ba230e82185 100755
--- a/src/tgbatest/bddprod.test
+++ b/src/tgbatest/bddprod.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/complementation.cc b/src/tgbatest/complementation.cc
index 6db9df3dd941573c5f5aa6954bcb6afc2fd55475..1892ee354b56cd3903bfe0eb96de248f4a3f27a7 100644
--- a/src/tgbatest/complementation.cc
+++ b/src/tgbatest/complementation.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iomanip>
 #include <iostream>
diff --git a/src/tgbatest/complementation.test b/src/tgbatest/complementation.test
index dfab0b884cee74bcf365985af3f3e1b59348fcc0..9552f3d78bca9ec8e6507a1f72281f57e4ee825b 100755
--- a/src/tgbatest/complementation.test
+++ b/src/tgbatest/complementation.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/cycles.test b/src/tgbatest/cycles.test
index 5c479bca8eef0a0fa5657564837b645f7cc5456e..745add0a74909e9458be04ff24db01900a8bfb59 100755
--- a/src/tgbatest/cycles.test
+++ b/src/tgbatest/cycles.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/src/tgbatest/defs.in b/src/tgbatest/defs.in
index 5ca394ee8e1038b07a1015ea4c35812859a0c3ba..ee04eb935f7cde469f2daf82fde221c391cc31e6 100644
--- a/src/tgbatest/defs.in
+++ b/src/tgbatest/defs.in
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Ensure we are running from the right directory.
 test -f ./defs || {
diff --git a/src/tgbatest/degendet.test b/src/tgbatest/degendet.test
index df1aace0e7fe792446cd243cdfc7b75311ba975c..fc4c6f136d6ab66b2230835b20f1494007b8eddc 100755
--- a/src/tgbatest/degendet.test
+++ b/src/tgbatest/degendet.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/degenid.test b/src/tgbatest/degenid.test
index 6ae6f90ebec06c34b9ca9c6d2ccf805229d82f43..fdd0abc7216890bcf06a4c4cf37065162d49669f 100755
--- a/src/tgbatest/degenid.test
+++ b/src/tgbatest/degenid.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/dfs.test b/src/tgbatest/dfs.test
index 694166b69f3a2af962fe2b49c2c7167c2a64c414..5dc40916350b79b39f2d09d00a4f0beb6bea309b 100755
--- a/src/tgbatest/dfs.test
+++ b/src/tgbatest/dfs.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/dupexp.test b/src/tgbatest/dupexp.test
index a41f68fc7a4178e798c0b05a578546fb666dca9d..c4c9321b8fc3a2953148fe14fec76e189b6dee55 100755
--- a/src/tgbatest/dupexp.test
+++ b/src/tgbatest/dupexp.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/eltl2tgba.test b/src/tgbatest/eltl2tgba.test
index 7b683e60bedd7d21a4abe6ab80a2bd8ed28b0252..62c83cc209ce4ae49b819fabe45d57422c90e12e 100755
--- a/src/tgbatest/eltl2tgba.test
+++ b/src/tgbatest/eltl2tgba.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit -1
 set -e
diff --git a/src/tgbatest/emptchk.test b/src/tgbatest/emptchk.test
index 27263cd44964acd378f49616a5a1a131cd42a513..4b1eb12f5bc906cf46c3f96fc46d973732a501b8 100755
--- a/src/tgbatest/emptchk.test
+++ b/src/tgbatest/emptchk.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/emptchke.test b/src/tgbatest/emptchke.test
index e398ee497c39a9b4dfa84e376de7632e63c7877c..7000285624263528cc2b8d5ebb4e0855dd9fd814 100755
--- a/src/tgbatest/emptchke.test
+++ b/src/tgbatest/emptchke.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/emptchkr.test b/src/tgbatest/emptchkr.test
index 569953fe6c56ab63460c53fcbda695fbf515c1f5..b70bc3ff8890befafb477baa0556479b62dc3a28 100755
--- a/src/tgbatest/emptchkr.test
+++ b/src/tgbatest/emptchkr.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Emptiness check on randomly generated state spaces.
 
diff --git a/src/tgbatest/explicit.cc b/src/tgbatest/explicit.cc
index b302563037b787c22c952064ab358644f3decb25..b9a49d52732082ec91b0ff268411dc7f156d2606 100644
--- a/src/tgbatest/explicit.cc
+++ b/src/tgbatest/explicit.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/explicit.test b/src/tgbatest/explicit.test
index 428d1196c39e78e4c3ace0be60a980a5307f9507..313bd8694457300c14667bfed275989bc43c43be 100755
--- a/src/tgbatest/explicit.test
+++ b/src/tgbatest/explicit.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/explicit2.cc b/src/tgbatest/explicit2.cc
index 8d5c2707484f5d91e02e075d23ba749159b2c585..3d7b526edebae8a112555da34078635968092cca 100644
--- a/src/tgbatest/explicit2.cc
+++ b/src/tgbatest/explicit2.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/explicit2.test b/src/tgbatest/explicit2.test
index 5c2a36b47a472733f64b6391738b28a4314dd808..6fcd7ad06204a19786504eb3e2ad131b7d012280 100755
--- a/src/tgbatest/explicit2.test
+++ b/src/tgbatest/explicit2.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/explpro2.test b/src/tgbatest/explpro2.test
index 329110d4b8aff70e8a43528ce145ed9b319d81c9..4624cf62c6ca486e72c8c408a921734b987d05c8 100755
--- a/src/tgbatest/explpro2.test
+++ b/src/tgbatest/explpro2.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/explpro3.test b/src/tgbatest/explpro3.test
index 81a90690265e092246aa79ba0cf6c62198660b49..78c53de6429038f619ac0a287bae599a39823ecf 100755
--- a/src/tgbatest/explpro3.test
+++ b/src/tgbatest/explpro3.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/explpro4.test b/src/tgbatest/explpro4.test
index e7ede0ac1a20de5f40ae987088b21aae04fb59a5..d73880bade0028385464d07b9aade4a95e4354a9 100755
--- a/src/tgbatest/explpro4.test
+++ b/src/tgbatest/explpro4.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/explprod.cc b/src/tgbatest/explprod.cc
index abcd7acf80a2c3740b3ed8e403a1937a4c77b299..8637ce66c622111785469db1b8bd10258c3ebe7f 100644
--- a/src/tgbatest/explprod.cc
+++ b/src/tgbatest/explprod.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/explprod.test b/src/tgbatest/explprod.test
index 1eed5e2e34a7742d4e1b2151ed118205b153da95..94c6d54c4b2420cd4826bf2e5f5d85a19143911c 100755
--- a/src/tgbatest/explprod.test
+++ b/src/tgbatest/explprod.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/intvcmp2.cc b/src/tgbatest/intvcmp2.cc
index 9ab9080674c1bd45e6fc468faca58703c0e7401d..39a5ace209ebfe8aac8ac01fc8f28fa27fd9950b 100644
--- a/src/tgbatest/intvcmp2.cc
+++ b/src/tgbatest/intvcmp2.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "misc/intvcmp2.hh"
diff --git a/src/tgbatest/intvcomp.cc b/src/tgbatest/intvcomp.cc
index 99564c50ec1b90fb3953e19f5b876788d670c284..09b37ec3e9c0d28d29a540e5792f96315000b442 100644
--- a/src/tgbatest/intvcomp.cc
+++ b/src/tgbatest/intvcomp.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include "misc/intvcomp.hh"
diff --git a/src/tgbatest/intvcomp.test b/src/tgbatest/intvcomp.test
index f13f22cad112fc80f136628d0a374a9072ab4212..9a529a0032cafe0cfe1d6ef95d40120221c6b5a7 100755
--- a/src/tgbatest/intvcomp.test
+++ b/src/tgbatest/intvcomp.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/kv.test b/src/tgbatest/kv.test
index 413c07f0462ab6c98ead4b807bcf01192f37472a..75a22fa386e3adf5e3adfa9a868247c4b8bb72e7 100755
--- a/src/tgbatest/kv.test
+++ b/src/tgbatest/kv.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/ltl2neverclaim.test b/src/tgbatest/ltl2neverclaim.test
index d58a9d3f303ff6fdae40c5406342dce65927d111..a047d919d7c1e6a48fe16e3f0c42410dd46e0b70 100755
--- a/src/tgbatest/ltl2neverclaim.test
+++ b/src/tgbatest/ltl2neverclaim.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Do some quick translations to make sure the neverclaims produced by
 # spot actually look correct!
diff --git a/src/tgbatest/ltl2ta.test b/src/tgbatest/ltl2ta.test
index 57a025c107c1691c29eb8354506064ba658fe369..d6f846fe1e327da9def79b7873a3ac4f96d79cba 100755
--- a/src/tgbatest/ltl2ta.test
+++ b/src/tgbatest/ltl2ta.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/ltl2tgba.cc b/src/tgbatest/ltl2tgba.cc
index fb45f633447b0bb0f45e8218d86f332401437b4e..c93a4a5326cca0b09aa901fcd635c4f7dca22d5c 100644
--- a/src/tgbatest/ltl2tgba.cc
+++ b/src/tgbatest/ltl2tgba.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <iomanip>
diff --git a/src/tgbatest/ltl2tgba.test b/src/tgbatest/ltl2tgba.test
index 3421611b384d24da6190b25c18a8cda5b54963c2..5a3950b3b64520bf13b7f7f1e3a47ec95aa1a62e 100755
--- a/src/tgbatest/ltl2tgba.test
+++ b/src/tgbatest/ltl2tgba.test
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/ltlcounter.test b/src/tgbatest/ltlcounter.test
index 3f7d0e04916ea3605a72223ec4a6fba200478e25..9082aeae9b861b3fa2715ac6c233b3f3759fd0eb 100755
--- a/src/tgbatest/ltlcounter.test
+++ b/src/tgbatest/ltlcounter.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/ltlprod.cc b/src/tgbatest/ltlprod.cc
index bb1b9b7afb2748c447fe70c922af60a9ed049304..690a045e96ac60ed80bb5721897607b626abe4f7 100644
--- a/src/tgbatest/ltlprod.cc
+++ b/src/tgbatest/ltlprod.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/ltlprod.test b/src/tgbatest/ltlprod.test
index 23e5f55a65bb1daae95292ba3f67726b39df4c6d..2ba8df9efd2631439c75fd6c0f2450ad4824f5ef 100755
--- a/src/tgbatest/ltlprod.test
+++ b/src/tgbatest/ltlprod.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/mixprod.cc b/src/tgbatest/mixprod.cc
index eace6ef2a46b022270693d99c33403ccb4416739..c58d39aea214eb96bf66191cd88735c9ee10709b 100644
--- a/src/tgbatest/mixprod.cc
+++ b/src/tgbatest/mixprod.cc
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/mixprod.test b/src/tgbatest/mixprod.test
index 2011a901c2dd693889e10f350410532aeb5ed299..23e1edc1ba763b3bfbedc100baaa54683f217ae6 100755
--- a/src/tgbatest/mixprod.test
+++ b/src/tgbatest/mixprod.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/neverclaimread.test b/src/tgbatest/neverclaimread.test
index d33f1d9977228ef16484e601b517c47a2d125b51..cd6590bd4c868e529fae190bafb17f9f6e2d5110 100755
--- a/src/tgbatest/neverclaimread.test
+++ b/src/tgbatest/neverclaimread.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/nondet.test b/src/tgbatest/nondet.test
index 1cc7decd4b6777de3597eb6d40d667881f2b8666..ae4e4c53f906439287c86065f2b81621929a577f 100755
--- a/src/tgbatest/nondet.test
+++ b/src/tgbatest/nondet.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/src/tgbatest/obligation.test b/src/tgbatest/obligation.test
index 970df730522139a806656fba449640558985def6..a4751e8daa31fe57cb2d67fa732cbd3bf664a145 100755
--- a/src/tgbatest/obligation.test
+++ b/src/tgbatest/obligation.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/powerset.cc b/src/tgbatest/powerset.cc
index 1b3d6536cf047b27c6ad9a763fcb2d35f1b5a023..cb85dc75fb588b99890eb9c1710b469c2e9dfeb8 100644
--- a/src/tgbatest/powerset.cc
+++ b/src/tgbatest/powerset.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/randpsl.test b/src/tgbatest/randpsl.test
index 3ea757a2ad8f5f2b08ca95fcc562d28daafb7069..205628ab82058506f900e6a6a488f24e1feef52e 100755
--- a/src/tgbatest/randpsl.test
+++ b/src/tgbatest/randpsl.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/randtgba.cc b/src/tgbatest/randtgba.cc
index 55dc8c05f15da3712a97acd593cf88e09c45f7a7..7b70ca5acebb36695467ae16b8a3f6326f812285 100644
--- a/src/tgbatest/randtgba.cc
+++ b/src/tgbatest/randtgba.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cassert>
 #include <cstdlib>
diff --git a/src/tgbatest/randtgba.test b/src/tgbatest/randtgba.test
index 47ff7d7c7e3f4e9341cb7f20076096f160e72e13..7460ece8a8dd80f6be800b286ae3a2e0ef8a9ca8 100755
--- a/src/tgbatest/randtgba.test
+++ b/src/tgbatest/randtgba.test
@@ -5,7 +5,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/readsave.test b/src/tgbatest/readsave.test
index 46592e434c40c0036f136bab5d7b6d7fdcec5bc3..ccd7170085549f9dc0a6a7770d6b95acccdedacc 100755
--- a/src/tgbatest/readsave.test
+++ b/src/tgbatest/readsave.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/renault.test b/src/tgbatest/renault.test
index e413a1555cece4bab118710998eae2bc25897519..edb3d91206d4f955511b8d93e8fcd44902d46969 100755
--- a/src/tgbatest/renault.test
+++ b/src/tgbatest/renault.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 set -e
diff --git a/src/tgbatest/scc.test b/src/tgbatest/scc.test
index 9608d5f8176eb3391235b2e9db4308ddcb6dafd8..dac341b08c4f6f44c5096a7b48a549ea920f3c51 100755
--- a/src/tgbatest/scc.test
+++ b/src/tgbatest/scc.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/sccsimpl.test b/src/tgbatest/sccsimpl.test
index 075074b90918a07924b71ae4ed263c6934ff2afd..102e58e681bf6f2ff95cc033bfcf7080d8b06921 100755
--- a/src/tgbatest/sccsimpl.test
+++ b/src/tgbatest/sccsimpl.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/spotlbtt.test b/src/tgbatest/spotlbtt.test
index 77da8f45509dacb9f2e3e7a14fcd5bee3a576bae..880aea67fad0a82ef66cfc94383a0ecea9653a3d 100755
--- a/src/tgbatest/spotlbtt.test
+++ b/src/tgbatest/spotlbtt.test
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 echo 'This test can take as long as 15 minutes on a 2GHz Pentium 4.'
diff --git a/src/tgbatest/spotlbtt2.test b/src/tgbatest/spotlbtt2.test
index 04f29ee001080cc348374374dfa89eb44d9e60a9..fdfec195c9bbae383b81429eaefa02f03642a766 100755
--- a/src/tgbatest/spotlbtt2.test
+++ b/src/tgbatest/spotlbtt2.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/taatgba.cc b/src/tgbatest/taatgba.cc
index 1eacf2abbf0985aa294679c83c5de665950c9e56..9ef8d987e86b9ef9ca41fb0793167d6d39153541 100644
--- a/src/tgbatest/taatgba.cc
+++ b/src/tgbatest/taatgba.cc
@@ -5,7 +5,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -14,9 +14,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/taatgba.test b/src/tgbatest/taatgba.test
index a7ae86cf324848d0472969c65b7f83a293d5440b..27d738f32e5dbe84e7541ab6ff84b3887851de6e 100755
--- a/src/tgbatest/taatgba.test
+++ b/src/tgbatest/taatgba.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs || exit -1
 set -e
diff --git a/src/tgbatest/tgbaread.cc b/src/tgbatest/tgbaread.cc
index 1935310b876937eb62440ee6f76ccd1c03c3ce69..c088f538225671ac98372eb5a16da5d01dd94735 100644
--- a/src/tgbatest/tgbaread.cc
+++ b/src/tgbatest/tgbaread.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/tgbaread.test b/src/tgbatest/tgbaread.test
index 6c0c4ed5a9d4a619900f9d179c74a86c2ce90c43..fd6749d12e996f1902cbad5859cacc46f93eddb7 100755
--- a/src/tgbatest/tgbaread.test
+++ b/src/tgbatest/tgbaread.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/tripprod.cc b/src/tgbatest/tripprod.cc
index b0d566d608d03b9396308d5c5c8d8e2509fa45ba..dfd65ebbc5cf02b2a4af9db8e6bf0ed4c0064638 100644
--- a/src/tgbatest/tripprod.cc
+++ b/src/tgbatest/tripprod.cc
@@ -8,7 +8,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <iostream>
 #include <cassert>
diff --git a/src/tgbatest/tripprod.test b/src/tgbatest/tripprod.test
index a700a7c3e5d3d750ab733ad3b81492a7590a2a69..976611a8f264da8d633a9e327589b1ca2917af78 100755
--- a/src/tgbatest/tripprod.test
+++ b/src/tgbatest/tripprod.test
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 . ./defs
diff --git a/src/tgbatest/wdba.test b/src/tgbatest/wdba.test
index 8a29efc6ba52a7a69ba63e0b95e21c726f937ce2..79ae05359c6da41963629a9e48c91bf21eae5fec 100755
--- a/src/tgbatest/wdba.test
+++ b/src/tgbatest/wdba.test
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/src/tgbatest/wdba2.test b/src/tgbatest/wdba2.test
index fb4e7816d911d882c262d3cbe35ff8866462b836..969c8cfe212012ff322b66a6f8b9d1085158a7ed 100755
--- a/src/tgbatest/wdba2.test
+++ b/src/tgbatest/wdba2.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . ./defs
 
diff --git a/wrap/Makefile.am b/wrap/Makefile.am
index 5b6b79251aed928642abe8950da16c6a544ee87c..270539cd4c22af5b18aedd604168585726237291 100644
--- a/wrap/Makefile.am
+++ b/wrap/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if USE_PYTHON
 SUBDIRS = python
diff --git a/wrap/python/Makefile.am b/wrap/python/Makefile.am
index 386013d20d69e693dc7693a3408e196baf0cc043..6a4326865055c97af9b423b8176e4c6eed7d2d99 100644
--- a/wrap/python/Makefile.am
+++ b/wrap/python/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = . ajax tests
 
diff --git a/wrap/python/ajax/Makefile.am b/wrap/python/ajax/Makefile.am
index 5a65399f3e5cfada5f513a50c8b7723aaf040029..d990cafe6f09c851ca8f0c7a8629e155508714c6 100644
--- a/wrap/python/ajax/Makefile.am
+++ b/wrap/python/ajax/Makefile.am
@@ -7,7 +7,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 nodist_noinst_SCRIPTS = spot.py
 EXTRA_DIST = $(srcdir)/spot.in README ltl2tgba.html css/ltl2tgba.css	\
diff --git a/wrap/python/ajax/spot.in b/wrap/python/ajax/spot.in
index 008c9cd7909dc08a390b5e1381230667e8114190..e6414b30b687e866e3e224f0e2e0216a96c8bf84 100755
--- a/wrap/python/ajax/spot.in
+++ b/wrap/python/ajax/spot.in
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import sys
diff --git a/wrap/python/buddy.i b/wrap/python/buddy.i
index e90945e4c890eda4ed97493032063d00502cac74..e25aecaf19ea66710c8ab5261b3121699961a734 100644
--- a/wrap/python/buddy.i
+++ b/wrap/python/buddy.i
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // This is derived from Buddy's headers, distributed with the
 // following license:
diff --git a/wrap/python/spot.i b/wrap/python/spot.i
index 1484769e6f329870581758fdbc6508e4763af8db..4fe6442f288fc47613ac2a517ced3e071aa802e7 100644
--- a/wrap/python/spot.i
+++ b/wrap/python/spot.i
@@ -9,7 +9,7 @@
 //
 // Spot is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
+// the Free Software Foundation; either version 3 of the License, or
 // (at your option) any later version.
 //
 // Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 // License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with Spot; see the file COPYING.  If not, write to the Free
-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 %{
   // Workaround for SWIG 2.0.2 using ptrdiff_t but not including cstddef.
diff --git a/wrap/python/tests/Makefile.am b/wrap/python/tests/Makefile.am
index 59bb712e09c65e2c8485d60d7e277b6343d9a3b3..d0666053237df3e67e6bd5af4afeaa7c321ab903 100644
--- a/wrap/python/tests/Makefile.am
+++ b/wrap/python/tests/Makefile.am
@@ -8,7 +8,7 @@
 ##
 ## Spot is free software; you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -17,9 +17,7 @@
 ## License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with Spot; see the file COPYING.  If not, write to the Free
-## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-## 02111-1307, USA.
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = \
   $(TESTS) \
diff --git a/wrap/python/tests/alarm.py b/wrap/python/tests/alarm.py
index 1fa739befb174bcad9773fa63b92cb915ee94e49..aef46d426ac4036b9b82d5919b77200cfd48bc0c 100755
--- a/wrap/python/tests/alarm.py
+++ b/wrap/python/tests/alarm.py
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import spot
 import time
diff --git a/wrap/python/tests/bddnqueen.py b/wrap/python/tests/bddnqueen.py
index 3df59766933c608075e615c03df374757271e9d9..22807e978bb9ca3846a2e0703e2c9f341ba01c1e 100755
--- a/wrap/python/tests/bddnqueen.py
+++ b/wrap/python/tests/bddnqueen.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Python translation of the C++ example from the BuDDy distribution.
 # (compare with buddy/examples/queen/queen.cxx)
diff --git a/wrap/python/tests/implies.py b/wrap/python/tests/implies.py
index 6f8db23f60bb3dd0d66253651e27615b51ee736e..2e8a86e3c2fac558198d995989e159e7849b8ee5 100755
--- a/wrap/python/tests/implies.py
+++ b/wrap/python/tests/implies.py
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 from buddy import *
diff --git a/wrap/python/tests/interdep.py b/wrap/python/tests/interdep.py
index ea6c7c738c7bb169e6fcf16541b6c5d56a8fbe8e..52f90d7f65339137903e369da5fb5913c273783a 100755
--- a/wrap/python/tests/interdep.py
+++ b/wrap/python/tests/interdep.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure that interdependencies between the spot and buddy wrappers
 # are not problematic.
diff --git a/wrap/python/tests/ltl2tgba.py b/wrap/python/tests/ltl2tgba.py
index bc9e467348f9e17adf0404e4503564ff58291822..a1dc464d4c35e82557183ed3700cdab95b6a0a0f 100755
--- a/wrap/python/tests/ltl2tgba.py
+++ b/wrap/python/tests/ltl2tgba.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This is a python translation of the ltl2tgba C++ test program.
 # Compare with src/tgbatest/ltl2tgba.cc.
diff --git a/wrap/python/tests/ltl2tgba.test b/wrap/python/tests/ltl2tgba.test
index e79e178d531f1762c5c4cdf5dfa63889346ddc34..156509728c7220e2b80b6b6d82a758dc005f9563 100755
--- a/wrap/python/tests/ltl2tgba.test
+++ b/wrap/python/tests/ltl2tgba.test
@@ -7,7 +7,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -16,9 +16,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 set -e
diff --git a/wrap/python/tests/ltlparse.py b/wrap/python/tests/ltlparse.py
index a8d9533327b03f81c6ff750c7bb0c6e6118aaf56..f972432ee68d39b2c7d40747c9b17b382b9bc765 100755
--- a/wrap/python/tests/ltlparse.py
+++ b/wrap/python/tests/ltlparse.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import spot
diff --git a/wrap/python/tests/ltlsimple.py b/wrap/python/tests/ltlsimple.py
index 671fda89bfc352e4d879edc9fa1eccfccbc081e4..1b4f6376114b3d9ad18085f60e47ebd381966538 100755
--- a/wrap/python/tests/ltlsimple.py
+++ b/wrap/python/tests/ltlsimple.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import spot
 import sys
diff --git a/wrap/python/tests/minato.py b/wrap/python/tests/minato.py
index 247cea2be96e9120eb772c00654fc79f6eae7faf..e7463cf5526d1d215e9e54474725abd9fa969706 100755
--- a/wrap/python/tests/minato.py
+++ b/wrap/python/tests/minato.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import spot
 import buddy
diff --git a/wrap/python/tests/modgray.py b/wrap/python/tests/modgray.py
index 6430d0451d8a57c650103144f26cacc3d1228143..0779f15a0500352ab83217671265fd2d48a4d9e5 100755
--- a/wrap/python/tests/modgray.py
+++ b/wrap/python/tests/modgray.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import spot
 import sys
diff --git a/wrap/python/tests/optionmap.py b/wrap/python/tests/optionmap.py
index 73d8cf0523a84ca7480751124132ce9fd153f208..9bce94e0c463053b6f2c609e7d2cebfad8d5b69c 100755
--- a/wrap/python/tests/optionmap.py
+++ b/wrap/python/tests/optionmap.py
@@ -9,7 +9,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -18,9 +18,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import spot
 
diff --git a/wrap/python/tests/parsetgba.py b/wrap/python/tests/parsetgba.py
index 9b6199a6382a934f04116dffa8c42217a4126710..2a075ebfa43da1fc732aa7e46782e24cebd76d33 100755
--- a/wrap/python/tests/parsetgba.py
+++ b/wrap/python/tests/parsetgba.py
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
 import spot
diff --git a/wrap/python/tests/run.in b/wrap/python/tests/run.in
index 1968a4ec18da6bfb6990e324b6213ea80048932b..79a21ee7aeb7d49d3717e8f2f4d641cc1d264a67 100644
--- a/wrap/python/tests/run.in
+++ b/wrap/python/tests/run.in
@@ -10,7 +10,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -19,9 +19,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Darwin needs some help in figuring out where non-installed libtool
 # libraries are (on this platform libtool encodes the expected final
diff --git a/wrap/python/tests/setxor.py b/wrap/python/tests/setxor.py
index 37754b775ca78993d332fcfb6ed55b691a427194..66f93c81aabe5cd7552ddb3064e10b6103119271 100755
--- a/wrap/python/tests/setxor.py
+++ b/wrap/python/tests/setxor.py
@@ -6,7 +6,7 @@
 #
 # Spot is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # Spot is distributed in the hope that it will be useful, but WITHOUT
@@ -15,9 +15,7 @@
 # License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Spot; see the file COPYING.  If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
 from buddy import *