[gnome-games] aisleriot: Change licence to GPL 3+



commit d501d70013303b8b572e42236e186d2589101062
Author: Christian Persch <chpe gnome org>
Date:   Fri Jul 10 19:48:45 2009 +0200

    aisleriot: Change licence to GPL 3+
    
    Relicence the libgamescard library code from LGPL 2+ to LGPL 3+ (resp.
    GPL 2+ to GPL 3+), and aisleriot from GPL 2+ to GPL 3+. The
    libgamescards licence changes also implies a blackjack licence change
    from GPL 2+ to GPL 3+.
    Add COPYING.GPL3 containing the text of the GPL version 3, and
    COPYING.README with a short summary of which code is licensed how.

 COPYING.GPL3                                 |  676 ++++++++++++++++++++++++++
 COPYING.README                               |    4 +
 Makefile.am                                  |    1 +
 aisleriot/aisleriot.supp                     |   13 +-
 aisleriot/baize.c                            |   23 +-
 aisleriot/baize.h                            |   23 +-
 aisleriot/board-noclutter.c                  |   29 +-
 aisleriot/board.c                            |   29 +-
 aisleriot/board.h                            |   25 +-
 aisleriot/card.c                             |   24 +-
 aisleriot/card.h                             |   23 +-
 aisleriot/conf.c                             |   25 +-
 aisleriot/conf.h                             |   23 +-
 aisleriot/game.c                             |   25 +-
 aisleriot/game.h                             |   23 +-
 aisleriot/get_titles.pl                      |   23 +-
 aisleriot/guile16-compat.h                   |   10 +-
 aisleriot/rules/Makefile.am                  |    5 +-
 aisleriot/rules/accordion.scm                |   10 +-
 aisleriot/rules/agnes.scm                    |   10 +-
 aisleriot/rules/athena.scm                   |   10 +-
 aisleriot/rules/auld_lang_syne.scm           |   10 +-
 aisleriot/rules/backbone.scm                 |   10 +-
 aisleriot/rules/bakers_dozen.scm             |   10 +-
 aisleriot/rules/bakers_game.scm              |   10 +-
 aisleriot/rules/bear_river.scm               |   10 +-
 aisleriot/rules/beleaguered_castle.scm       |   10 +-
 aisleriot/rules/block_ten.scm                |   10 +-
 aisleriot/rules/bristol.scm                  |   10 +-
 aisleriot/rules/camelot.scm                  |   10 +-
 aisleriot/rules/canfield.scm                 |   10 +-
 aisleriot/rules/carpet.scm                   |   10 +-
 aisleriot/rules/chessboard.scm               |   10 +-
 aisleriot/rules/clock.scm                    |   10 +-
 aisleriot/rules/cover.scm                    |   10 +-
 aisleriot/rules/cruel.scm                    |   10 +-
 aisleriot/rules/diamond_mine.scm             |   10 +-
 aisleriot/rules/doublets.scm                 |   10 +-
 aisleriot/rules/eagle_wing.scm               |   10 +-
 aisleriot/rules/easthaven.scm                |   10 +-
 aisleriot/rules/eight_off.scm                |   10 +-
 aisleriot/rules/elevator.scm                 |   10 +-
 aisleriot/rules/escalator.scm                |   10 +-
 aisleriot/rules/first_law.scm                |   10 +-
 aisleriot/rules/fortress.scm                 |   10 +-
 aisleriot/rules/fortunes.scm                 |   10 +-
 aisleriot/rules/forty_thieves.scm            |   10 +-
 aisleriot/rules/fourteen.scm                 |   10 +-
 aisleriot/rules/freecell.scm                 |   25 +-
 aisleriot/rules/gaps.scm                     |   10 +-
 aisleriot/rules/gay_gordons.scm              |   10 +-
 aisleriot/rules/giant.scm                    |   10 +-
 aisleriot/rules/glenwood.scm                 |   10 +-
 aisleriot/rules/gold_mine.scm                |   10 +-
 aisleriot/rules/golf.scm                     |   10 +-
 aisleriot/rules/gypsy.scm                    |   10 +-
 aisleriot/rules/helsinki.scm                 |   10 +-
 aisleriot/rules/hopscotch.scm                |   10 +-
 aisleriot/rules/isabel.scm                   |   10 +-
 aisleriot/rules/jamestown.scm                |   10 +-
 aisleriot/rules/jumbo.scm                    |   10 +-
 aisleriot/rules/kansas.scm                   |   10 +-
 aisleriot/rules/king_albert.scm              |   10 +-
 aisleriot/rules/kings_audience.scm           |   10 +-
 aisleriot/rules/klondike.scm                 |   10 +-
 aisleriot/rules/labyrinth.scm                |   10 +-
 aisleriot/rules/lady_jane.scm                |   10 +-
 aisleriot/rules/maze.scm                     |   10 +-
 aisleriot/rules/monte_carlo.scm              |   10 +-
 aisleriot/rules/napoleons_tomb.scm           |   10 +-
 aisleriot/rules/neighbor.scm                 |   10 +-
 aisleriot/rules/odessa.scm                   |   10 +-
 aisleriot/rules/osmosis.scm                  |   10 +-
 aisleriot/rules/peek.scm                     |   10 +-
 aisleriot/rules/pileon.scm                   |   10 +-
 aisleriot/rules/plait.scm                    |   25 +-
 aisleriot/rules/poker.scm                    |   10 +-
 aisleriot/rules/quatorze.scm                 |   10 +-
 aisleriot/rules/royal_east.scm               |   10 +-
 aisleriot/rules/saratoga.scm                 |   10 +-
 aisleriot/rules/scorpion.scm                 |   10 +-
 aisleriot/rules/scuffle.scm                  |   10 +-
 aisleriot/rules/seahaven.scm                 |   10 +-
 aisleriot/rules/sir_tommy.scm                |   10 +-
 aisleriot/rules/spider.scm                   |   10 +-
 aisleriot/rules/spider_three_decks.scm       |   10 +-
 aisleriot/rules/spiderette.scm               |   10 +-
 aisleriot/rules/straight_up.scm              |   10 +-
 aisleriot/rules/streets_and_alleys.scm       |   10 +-
 aisleriot/rules/template.scm                 |   10 +-
 aisleriot/rules/ten_across.scm               |   10 +-
 aisleriot/rules/terrace.scm                  |   10 +-
 aisleriot/rules/thieves.scm                  |   10 +-
 aisleriot/rules/thirteen.scm                 |   10 +-
 aisleriot/rules/thumb_and_pouch.scm          |   10 +-
 aisleriot/rules/treize.scm                   |   10 +-
 aisleriot/rules/triple_peaks.scm             |   10 +-
 aisleriot/rules/union_square.scm             |   10 +-
 aisleriot/rules/valentine.scm                |   10 +-
 aisleriot/rules/westhaven.scm                |   10 +-
 aisleriot/rules/whitehead.scm                |   10 +-
 aisleriot/rules/will_o_the_wisp.scm          |   10 +-
 aisleriot/rules/yield.scm                    |   10 +-
 aisleriot/rules/yukon.scm                    |   11 +-
 aisleriot/rules/zebra.scm                    |   10 +-
 aisleriot/slot-renderer.c                    |   23 +-
 aisleriot/slot-renderer.h                    |   23 +-
 aisleriot/sol.c                              |   10 +-
 aisleriot/sol.scm                            |   10 +-
 aisleriot/stats-dialog.c                     |   25 +-
 aisleriot/stats-dialog.h                     |   23 +-
 aisleriot/util.c                             |   10 +-
 aisleriot/util.h                             |   23 +-
 aisleriot/window.c                           |   27 +-
 aisleriot/window.h                           |   23 +-
 libgames-support/games-card-images.c         |   32 +-
 libgames-support/games-card-images.h         |   18 +-
 libgames-support/games-card-private.h        |   32 +-
 libgames-support/games-card-textures-cache.c |   31 +-
 libgames-support/games-card-textures-cache.h |   31 +-
 libgames-support/games-card-theme-fixed.c    |   26 +-
 libgames-support/games-card-theme-preimage.c |   32 +-
 libgames-support/games-card-theme-private.h  |   33 +-
 libgames-support/games-card-theme-pysol.c    |   13 +-
 libgames-support/games-card-theme-sliced.c   |   13 +-
 libgames-support/games-card-theme-svg.c      |   26 +-
 libgames-support/games-card-theme.c          |   32 +-
 libgames-support/games-card-theme.h          |   20 +-
 libgames-support/games-card-themes.c         |   32 +-
 libgames-support/games-card-themes.h         |   20 +-
 libgames-support/games-card.c                |   24 +-
 libgames-support/games-card.h                |   32 +-
 libgames-support/games-pixbuf-utils.c        |   17 +-
 libgames-support/games-pixbuf-utils.h        |   17 +-
 libgames-support/games-runtime.c             |    7 +-
 libgames-support/theme-install.ini           |   21 +-
 136 files changed, 1545 insertions(+), 1066 deletions(-)
---
diff --git a/COPYING.GPL3 b/COPYING.GPL3
new file mode 100644
index 0000000..4432540
--- /dev/null
+++ b/COPYING.GPL3
@@ -0,0 +1,676 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 3, 29 June 2007
+
+ 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
+
+  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
+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 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 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.
+
+		       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.
+
+  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 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 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
+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
+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
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <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, 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/COPYING.README b/COPYING.README
new file mode 100644
index 0000000..98b81ed
--- /dev/null
+++ b/COPYING.README
@@ -0,0 +1,4 @@
+This code is licensed as follows:
+- libgamescards in libgames-support/, aisleriot, and blackjack: GPL 3-or-later
+- all other code in libgames-support/ is either LGPL 2-or-later or GPL 2-or-later
+- all other games are GPL 2-or-later
diff --git a/Makefile.am b/Makefile.am
index 6c72050..a9c083c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ DIST_SUBDIRS = po dependencies icons sounds libgames-support tests $(allgames) $
 EXTRA_DIST = \
 	autogen.sh \
 	COPYING-DOCS \
+	COPYING.GPL3 \
 	xmldocs.make \
 	omf.make \
 	MAINTAINERS	\
diff --git a/aisleriot/aisleriot.supp b/aisleriot/aisleriot.supp
index 3f9a06f..b2c1204 100644
--- a/aisleriot/aisleriot.supp
+++ b/aisleriot/aisleriot.supp
@@ -2,19 +2,18 @@
 # Suppresses common invalid reads and conditional jumps from guile GC.
 # Might be a bit overly aggressive.
 #
-# This programme is free software; you can redistribute it and'or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This programme is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this library; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 {
   scm_i_find_heap_segment_containing_object
diff --git a/aisleriot/baize.c b/aisleriot/baize.c
index 8b5ee54..51ec6fa 100644
--- a/aisleriot/baize.c
+++ b/aisleriot/baize.c
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2008 Neil Roberts
+ * Copyright © 2008 Neil Roberts
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/baize.h b/aisleriot/baize.h
index 6beb584..d6585b3 100644
--- a/aisleriot/baize.h
+++ b/aisleriot/baize.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2008 Neil Roberts
+ * Copyright © 2008 Neil Roberts
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_BAIZE_H
diff --git a/aisleriot/board-noclutter.c b/aisleriot/board-noclutter.c
index 467dc71..7ac6dfb 100644
--- a/aisleriot/board-noclutter.c
+++ b/aisleriot/board-noclutter.c
@@ -1,23 +1,22 @@
 /*
- *  Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
- *  Copyright © 2007, 2008 Christian Persch
+ * Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
+ * Copyright © 2007, 2008 Christian Persch
  *
- *  Some code copied from gtk+/gtk/gtkiconview:
- *  Copyright © 2002, 2004  Anders Carlsson <andersca gnu org>
+ * Some code copied from gtk+/gtk/gtkiconview (LGPL2+):
+ * Copyright © 2002, 2004  Anders Carlsson <andersca gnu org>
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/board.c b/aisleriot/board.c
index 6ccca78..8df4a25 100644
--- a/aisleriot/board.c
+++ b/aisleriot/board.c
@@ -1,23 +1,22 @@
 /*
- *  Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
- *  Copyright © 2007, 2008 Christian Persch
+ * Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
+ * Copyright © 2007, 2008 Christian Persch
  *
- *  Some code copied from gtk+/gtk/gtkiconview:
- *  Copyright © 2002, 2004  Anders Carlsson <andersca gnu org>
+ * Some code copied from gtk+/gtk/gtkiconview (LGPL2+):
+ * Copyright © 2002, 2004  Anders Carlsson <andersca gnu org>
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/board.h b/aisleriot/board.h
index 266f3fc..21691b3 100644
--- a/aisleriot/board.h
+++ b/aisleriot/board.h
@@ -1,20 +1,19 @@
 /*
- *  Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
- *  Copyright © 2007 Christian Persch
+ * Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_BOARD_H
diff --git a/aisleriot/card.c b/aisleriot/card.c
index 5f9be11..d7c1ef9 100644
--- a/aisleriot/card.c
+++ b/aisleriot/card.c
@@ -1,22 +1,22 @@
 /*
- *  Copyright © 2008 Neil Roberts
+ * Copyright © 2008 Neil Roberts
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
+
 #include <clutter/clutter.h>
 #include <gtk/gtk.h>
 #include <cogl/cogl.h>
diff --git a/aisleriot/card.h b/aisleriot/card.h
index a886613..3ec9f70 100644
--- a/aisleriot/card.h
+++ b/aisleriot/card.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2008 Neil Roberts
+ * Copyright © 2008 Neil Roberts
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_CARD_H
diff --git a/aisleriot/conf.c b/aisleriot/conf.c
index bebe08e..6a587bc 100644
--- a/aisleriot/conf.c
+++ b/aisleriot/conf.c
@@ -1,20 +1,19 @@
 /*
- *  Copyright © 2003 Callum McKenzie <callum physics otago ac nz>
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2003 Callum McKenzie <callum physics otago ac nz>
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope conf it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/conf.h b/aisleriot/conf.h
index d19a879..3aa7c57 100644
--- a/aisleriot/conf.h
+++ b/aisleriot/conf.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope conf it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_CONF_H
diff --git a/aisleriot/game.c b/aisleriot/game.c
index 648ccfc..b4bc4e2 100644
--- a/aisleriot/game.c
+++ b/aisleriot/game.c
@@ -1,20 +1,19 @@
 /*
- *  Copyright © 1998, 2003 Jonathan Blandford <jrb alum mit edu>
- *  Copyright © 2007 Christian Persch
+ * Copyright © 1998, 2003 Jonathan Blandford <jrb alum mit edu>
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope game it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/game.h b/aisleriot/game.h
index 541e34a..32691e7 100644
--- a/aisleriot/game.h
+++ b/aisleriot/game.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope game it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_GAME_H
diff --git a/aisleriot/get_titles.pl b/aisleriot/get_titles.pl
index c548e70..d744a73 100755
--- a/aisleriot/get_titles.pl
+++ b/aisleriot/get_titles.pl
@@ -4,19 +4,18 @@
 #
 #  Copyright (C) 2001 Free Software Foundation.
 #
-#  This script is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#  This script is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 #  Authors:
 #  2006 - Richard Hoelscher <rah rahga com>
@@ -26,6 +25,8 @@ open OUTFILE, "> game-names.h";
 
 opendir(DIR, "rules/");
 
+print OUTFILE "/* This is a generated file; DO NOT EDIT */\n";
+
 while ($_ = readdir(DIR)) {
   if (s/^(.)(.*).scm/\u$1$2/) { # Match scm filenames. Upcase first letter.
     s/_(.)/ \u$1/g;             # Replace underscores and following letter
diff --git a/aisleriot/guile16-compat.h b/aisleriot/guile16-compat.h
index d0f4cc4..7129df5 100644
--- a/aisleriot/guile16-compat.h
+++ b/aisleriot/guile16-compat.h
@@ -1,10 +1,10 @@
 /*
  * Copyright © 2007 Christian Persch
  *
- * This game 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, or (at your option)
- * any later version.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
  */
 
 #ifndef AISLERIOT_GUILE16_COMPAT_H
diff --git a/aisleriot/rules/Makefile.am b/aisleriot/rules/Makefile.am
index 6302a8e..149839e 100644
--- a/aisleriot/rules/Makefile.am
+++ b/aisleriot/rules/Makefile.am
@@ -7,7 +7,6 @@ rules_DATA  = 			\
 	agnes.scm		\
 	athena.scm		\
 	auld_lang_syne.scm	\
-	aunt_mary.scm		\
 	backbone.scm		\
 	bakers_dozen.scm	\
 	bakers_game.scm		\
@@ -92,6 +91,10 @@ rules_DATA  = 			\
 	plait.scm		\
 	$(NULL)
 
+# aunt_mary.scm
+# was temporarily disabled because the licence is unclear
+# about whether it's GPL 2 or GPL 2+ (see bug #325039 comment 5).
+
 EXTRA_DIST = \
 	$(rules_DATA)	\
 	template.scm
diff --git a/aisleriot/rules/accordion.scm b/aisleriot/rules/accordion.scm
index 7e78190..b0636f0 100644
--- a/aisleriot/rules/accordion.scm
+++ b/aisleriot/rules/accordion.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - accordion.scm
 ; Copyright (C) 2008 Ed Sirett <ed makewrite demon co uk>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define row1 '(0 1 2 3 4 5 6 7 8 ))
 (define row2 '(9 10 11 12 13 14 15 16 17 ))
diff --git a/aisleriot/rules/agnes.scm b/aisleriot/rules/agnes.scm
index 92f64c9..2e8b630 100644
--- a/aisleriot/rules/agnes.scm
+++ b/aisleriot/rules/agnes.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - agnes.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 ;
 ;
 ; Andersca claims that seed 1791329065 wins
diff --git a/aisleriot/rules/athena.scm b/aisleriot/rules/athena.scm
index db3a5df..76bb02d 100644
--- a/aisleriot/rules/athena.scm
+++ b/aisleriot/rules/athena.scm
@@ -3,10 +3,10 @@
 ;; based on klondike.scm
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,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/>.
 
 ;; Athena differs from Klondike only in the intial layout
 ;; including 1 or 3 card deal, and any other options like ...
diff --git a/aisleriot/rules/auld_lang_syne.scm b/aisleriot/rules/auld_lang_syne.scm
index 4ed5c4f..65b6beb 100644
--- a/aisleriot/rules/auld_lang_syne.scm
+++ b/aisleriot/rules/auld_lang_syne.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - auld_lang_syne.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/backbone.scm b/aisleriot/rules/backbone.scm
index b22dfae..b0dcc0b 100644
--- a/aisleriot/rules/backbone.scm
+++ b/aisleriot/rules/backbone.scm
@@ -2,10 +2,10 @@
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>,
 ;                      2005 Vincent Povirk <madewokherd gmail com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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/>.
 
 (define tableau '(0 1 6 7 12 13 16 17))
 (define foundation '(2 3 4 5 8 9 10 11))
diff --git a/aisleriot/rules/bakers_dozen.scm b/aisleriot/rules/bakers_dozen.scm
index 7169e51..1fe1c1b 100644
--- a/aisleriot/rules/bakers_dozen.scm
+++ b/aisleriot/rules/bakers_dozen.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - bakers_dozen.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/bakers_game.scm b/aisleriot/rules/bakers_game.scm
index c761880..a9c7d64 100644
--- a/aisleriot/rules/bakers_game.scm
+++ b/aisleriot/rules/bakers_game.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - bakers_game.scm
 ; Copyright (C) 2008 Vincent Povirk <madewokherd gmail com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (load "freecell.scm")
 
diff --git a/aisleriot/rules/bear_river.scm b/aisleriot/rules/bear_river.scm
index d152228..4dacc8b 100644
--- a/aisleriot/rules/bear_river.scm
+++ b/aisleriot/rules/bear_river.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - Bear River
 ; Copyright (C) 2009 Vincent Povirk
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 
 
diff --git a/aisleriot/rules/beleaguered_castle.scm b/aisleriot/rules/beleaguered_castle.scm
index 05530b2..428ae9e 100644
--- a/aisleriot/rules/beleaguered_castle.scm
+++ b/aisleriot/rules/beleaguered_castle.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - Beleaguered Castle
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/block_ten.scm b/aisleriot/rules/block_ten.scm
index c6ecfaf..6300b51 100644
--- a/aisleriot/rules/block_ten.scm
+++ b/aisleriot/rules/block_ten.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - block_ten.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/bristol.scm b/aisleriot/rules/bristol.scm
index fbefe40..4e2b7e4 100644
--- a/aisleriot/rules/bristol.scm
+++ b/aisleriot/rules/bristol.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - bristol.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/camelot.scm b/aisleriot/rules/camelot.scm
index 2669390..3c168b0 100644
--- a/aisleriot/rules/camelot.scm
+++ b/aisleriot/rules/camelot.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - camelot.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (def-save-var add-stage #t)
 (def-save-var fill-count 0)
diff --git a/aisleriot/rules/canfield.scm b/aisleriot/rules/canfield.scm
index b7990a0..fc99a3a 100644
--- a/aisleriot/rules/canfield.scm
+++ b/aisleriot/rules/canfield.scm
@@ -1,10 +1,10 @@
 	; AisleRiot - canfield.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define BASE-VAL 0)
 
diff --git a/aisleriot/rules/carpet.scm b/aisleriot/rules/carpet.scm
index df25f86..9d992f3 100644
--- a/aisleriot/rules/carpet.scm
+++ b/aisleriot/rules/carpet.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - carpet.scm
 ; Copyright (C) 2005 Vincent Povirk <madewokherd gmail com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (tableau? slot-id)
   (< 5 slot-id))
diff --git a/aisleriot/rules/chessboard.scm b/aisleriot/rules/chessboard.scm
index be78182..97fc2c4 100644
--- a/aisleriot/rules/chessboard.scm
+++ b/aisleriot/rules/chessboard.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - chessboard.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (def-save-var BASE-VAL 0)
 (def-save-var base-set? #f)
diff --git a/aisleriot/rules/clock.scm b/aisleriot/rules/clock.scm
index 5d7b15b..7498844 100644
--- a/aisleriot/rules/clock.scm
+++ b/aisleriot/rules/clock.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - clock.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/cover.scm b/aisleriot/rules/cover.scm
index e0c1a92..f60b5f9 100644
--- a/aisleriot/rules/cover.scm
+++ b/aisleriot/rules/cover.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - cover.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/cruel.scm b/aisleriot/rules/cruel.scm
index 344db22..412b9ab 100644
--- a/aisleriot/rules/cruel.scm
+++ b/aisleriot/rules/cruel.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - cruel.scm
 ; Copyright (C) 2005 Zach Keene <zjkeene bellsouth net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define stock 0)
 (define foundations '(1 2 3 4))
diff --git a/aisleriot/rules/diamond_mine.scm b/aisleriot/rules/diamond_mine.scm
index 1a92e42..c536993 100644
--- a/aisleriot/rules/diamond_mine.scm
+++ b/aisleriot/rules/diamond_mine.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - diamond_mine.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/doublets.scm b/aisleriot/rules/doublets.scm
index d51340f..17b1dbd 100644
--- a/aisleriot/rules/doublets.scm
+++ b/aisleriot/rules/doublets.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - doublets.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 
 (define (new-game)
diff --git a/aisleriot/rules/eagle_wing.scm b/aisleriot/rules/eagle_wing.scm
index 07fb2e7..3d335d1 100644
--- a/aisleriot/rules/eagle_wing.scm
+++ b/aisleriot/rules/eagle_wing.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - eagle_wing.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define BASE-VAL 0)
 
diff --git a/aisleriot/rules/easthaven.scm b/aisleriot/rules/easthaven.scm
index 0d71578..b9655f4 100644
--- a/aisleriot/rules/easthaven.scm
+++ b/aisleriot/rules/easthaven.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - easthaven.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/eight_off.scm b/aisleriot/rules/eight_off.scm
index d1421d8..9073c83 100644
--- a/aisleriot/rules/eight_off.scm
+++ b/aisleriot/rules/eight_off.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - bakers_game.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (def-save-var free-reserves 0)
 
diff --git a/aisleriot/rules/elevator.scm b/aisleriot/rules/elevator.scm
index 5770a23..28f3114 100644
--- a/aisleriot/rules/elevator.scm
+++ b/aisleriot/rules/elevator.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - elevator.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/escalator.scm b/aisleriot/rules/escalator.scm
index 99034ba..0a0cefa 100644
--- a/aisleriot/rules/escalator.scm
+++ b/aisleriot/rules/escalator.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - escalator.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define covering-vector '#(
    (2 . (3 . 4))
diff --git a/aisleriot/rules/first_law.scm b/aisleriot/rules/first_law.scm
index 54e4cdd..38192c6 100644
--- a/aisleriot/rules/first_law.scm
+++ b/aisleriot/rules/first_law.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - first_law.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/fortress.scm b/aisleriot/rules/fortress.scm
index 660e42d..da47642 100644
--- a/aisleriot/rules/fortress.scm
+++ b/aisleriot/rules/fortress.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - fortress.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/fortunes.scm b/aisleriot/rules/fortunes.scm
index 73fefa5..30751f8 100644
--- a/aisleriot/rules/fortunes.scm
+++ b/aisleriot/rules/fortunes.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - fortunes.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 
 (define (new-game)
diff --git a/aisleriot/rules/forty_thieves.scm b/aisleriot/rules/forty_thieves.scm
index 93be227..30fbed8 100644
--- a/aisleriot/rules/forty_thieves.scm
+++ b/aisleriot/rules/forty_thieves.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - forty_thieves.scm
 ; Copyright (C) 2008 Ed Sirett  <ed makewrite demon co uk>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/fourteen.scm b/aisleriot/rules/fourteen.scm
index c530c4a..bb2090d 100644
--- a/aisleriot/rules/fourteen.scm
+++ b/aisleriot/rules/fourteen.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - fourteen.scm
 ; Copyright (C) 1999 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/freecell.scm b/aisleriot/rules/freecell.scm
index 46c23d9..8a7a7c2 100644
--- a/aisleriot/rules/freecell.scm
+++ b/aisleriot/rules/freecell.scm
@@ -4,19 +4,18 @@
 
 ;; Author: Changwoo Ryu <cwryu adam kaist ac kr>
 
-;; 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, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; This program is free software: you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
+;
+; This program is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/aisleriot/rules/gaps.scm b/aisleriot/rules/gaps.scm
index 94929f6..c32047a 100644
--- a/aisleriot/rules/gaps.scm
+++ b/aisleriot/rules/gaps.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - gaps.scm
 ; Copyright (C) 2005 Zach Keene <zjkeene bellsouth net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define row1 '(0 1 2 3 4 5 6 7 8 9 10 11 12))
 (define row2 '(13 14 15 16 17 18 19 20 21 22 23 24 25))
diff --git a/aisleriot/rules/gay_gordons.scm b/aisleriot/rules/gay_gordons.scm
index bcdf4ce..4809681 100644
--- a/aisleriot/rules/gay_gordons.scm
+++ b/aisleriot/rules/gay_gordons.scm
@@ -4,10 +4,10 @@
 ; Code to construct a winnable deal: Callum McKenzie with inspriation
 ; from Jeff Barry. 2005/04/14.
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,9 +15,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/>.
 
 ; Check if two cards match within the rules of the game.
 ;
diff --git a/aisleriot/rules/giant.scm b/aisleriot/rules/giant.scm
index fa5ee2a..da4fb85 100644
--- a/aisleriot/rules/giant.scm
+++ b/aisleriot/rules/giant.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - giant.scm
 ; Copyright (C) 2009 Ed Sirett <ed makewrite demon co uk>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 
 ;set up the deck
diff --git a/aisleriot/rules/glenwood.scm b/aisleriot/rules/glenwood.scm
index cf1e1e9..e121733 100644
--- a/aisleriot/rules/glenwood.scm
+++ b/aisleriot/rules/glenwood.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - glenwood.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (def-save-var BASE-VAL 0)
 
diff --git a/aisleriot/rules/gold_mine.scm b/aisleriot/rules/gold_mine.scm
index 957a8e8..ce504db 100644
--- a/aisleriot/rules/gold_mine.scm
+++ b/aisleriot/rules/gold_mine.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - gold_mine.scm
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (load "klondike.scm")
 
diff --git a/aisleriot/rules/golf.scm b/aisleriot/rules/golf.scm
index f9d03b5..99085ff 100644
--- a/aisleriot/rules/golf.scm
+++ b/aisleriot/rules/golf.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - golf.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define extend-waste #t)
 
diff --git a/aisleriot/rules/gypsy.scm b/aisleriot/rules/gypsy.scm
index eb78839..9da3b32 100644
--- a/aisleriot/rules/gypsy.scm
+++ b/aisleriot/rules/gypsy.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - gypsy.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/helsinki.scm b/aisleriot/rules/helsinki.scm
index dbc0aed..4ffd2d6 100644
--- a/aisleriot/rules/helsinki.scm
+++ b/aisleriot/rules/helsinki.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - helsinki.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/hopscotch.scm b/aisleriot/rules/hopscotch.scm
index 02a5811..42892c9 100644
--- a/aisleriot/rules/hopscotch.scm
+++ b/aisleriot/rules/hopscotch.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - hopscotch.scm
 ; Copyright (C) 1999 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/isabel.scm b/aisleriot/rules/isabel.scm
index c94d6ef..4327115 100644
--- a/aisleriot/rules/isabel.scm
+++ b/aisleriot/rules/isabel.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - isabel.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/jamestown.scm b/aisleriot/rules/jamestown.scm
index dd10817..ac306ea 100644
--- a/aisleriot/rules/jamestown.scm
+++ b/aisleriot/rules/jamestown.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - jamestown.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/jumbo.scm b/aisleriot/rules/jumbo.scm
index 3375834..d661f9c 100644
--- a/aisleriot/rules/jumbo.scm
+++ b/aisleriot/rules/jumbo.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - jumbo.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/kansas.scm b/aisleriot/rules/kansas.scm
index 9ab2005..513244d 100644
--- a/aisleriot/rules/kansas.scm
+++ b/aisleriot/rules/kansas.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - kansas.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define BASE-VAL 0)
 
diff --git a/aisleriot/rules/king_albert.scm b/aisleriot/rules/king_albert.scm
index 0a50a13..88827e0 100644
--- a/aisleriot/rules/king_albert.scm
+++ b/aisleriot/rules/king_albert.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - king_albert.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/kings_audience.scm b/aisleriot/rules/kings_audience.scm
index cd6dd8f..1232166 100644
--- a/aisleriot/rules/kings_audience.scm
+++ b/aisleriot/rules/kings_audience.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - king's_audience.scm
 ; Copyright (C) 2005 Zach Keene
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define stock 11)
 (define waste 12)
diff --git a/aisleriot/rules/klondike.scm b/aisleriot/rules/klondike.scm
index b074bc3..a3e7ec4 100644
--- a/aisleriot/rules/klondike.scm
+++ b/aisleriot/rules/klondike.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - klondike.scm
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define deal-one #t)    ;deal one card at a time from stock to waste
 (define deal-three #f)  ;deal three cards at a time from stock to waste
diff --git a/aisleriot/rules/labyrinth.scm b/aisleriot/rules/labyrinth.scm
index db07a10..07257de 100644
--- a/aisleriot/rules/labyrinth.scm
+++ b/aisleriot/rules/labyrinth.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - labyrinth.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (def-save-var first-row #f)
 
diff --git a/aisleriot/rules/lady_jane.scm b/aisleriot/rules/lady_jane.scm
index 7567ca8..7ba6a4c 100644
--- a/aisleriot/rules/lady_jane.scm
+++ b/aisleriot/rules/lady_jane.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - lady_jane.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define BASE-VAL 0)
 
diff --git a/aisleriot/rules/maze.scm b/aisleriot/rules/maze.scm
index 8565242..3d0285d 100644
--- a/aisleriot/rules/maze.scm
+++ b/aisleriot/rules/maze.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - maze.scm
 ; Copyright (C) 2000 Matthew Wilcox <willy linuxcare com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define card '())
 
diff --git a/aisleriot/rules/monte_carlo.scm b/aisleriot/rules/monte_carlo.scm
index e0ac27b..3eaf550 100644
--- a/aisleriot/rules/monte_carlo.scm
+++ b/aisleriot/rules/monte_carlo.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - monte_carlo.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/napoleons_tomb.scm b/aisleriot/rules/napoleons_tomb.scm
index 633d144..a0a6c22 100644
--- a/aisleriot/rules/napoleons_tomb.scm
+++ b/aisleriot/rules/napoleons_tomb.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - napoleons_tomb.scm
 ; Copyright (C) 2007 Kimmo Karlsson <kimmo karlsson gmail com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 
 ;;;;
diff --git a/aisleriot/rules/neighbor.scm b/aisleriot/rules/neighbor.scm
index 9bca38d..ebee160 100644
--- a/aisleriot/rules/neighbor.scm
+++ b/aisleriot/rules/neighbor.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - neighbor.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/odessa.scm b/aisleriot/rules/odessa.scm
index bbc964a..f4e402b 100644
--- a/aisleriot/rules/odessa.scm
+++ b/aisleriot/rules/odessa.scm
@@ -2,10 +2,10 @@
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;                    Felix Bellaby <felix pooh u-net com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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/>.
 
 
 ;set up the deck
diff --git a/aisleriot/rules/osmosis.scm b/aisleriot/rules/osmosis.scm
index 13b7740..0c1fa26 100644
--- a/aisleriot/rules/osmosis.scm
+++ b/aisleriot/rules/osmosis.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - osmosis.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define deal-three #f)
 
diff --git a/aisleriot/rules/peek.scm b/aisleriot/rules/peek.scm
index 5e5419f..3b14791 100644
--- a/aisleriot/rules/peek.scm
+++ b/aisleriot/rules/peek.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - peek.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (load "osmosis.scm")
 
diff --git a/aisleriot/rules/pileon.scm b/aisleriot/rules/pileon.scm
index b36d5a2..2725bb7 100644
--- a/aisleriot/rules/pileon.scm
+++ b/aisleriot/rules/pileon.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - pileon.scm
 ; Copyright (C) 1998 Nick Lamb <njl195 zepler org uk>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/plait.scm b/aisleriot/rules/plait.scm
index 74bfc0f..f6790b8 100644
--- a/aisleriot/rules/plait.scm
+++ b/aisleriot/rules/plait.scm
@@ -4,19 +4,18 @@
 
 ;; Author: W. Borgert <debacle debian org>
 
-;; 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, or (at your option)
-;; any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program; if not, write to the Free Software
-;; Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+; This program is free software: you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
+;
+; This program is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ;; @(#) $Id: plait.scm,v 1.14 2005/07/10 07:08:54 callum Exp $
 
diff --git a/aisleriot/rules/poker.scm b/aisleriot/rules/poker.scm
index 0eb68cc..8390fe8 100644
--- a/aisleriot/rules/poker.scm
+++ b/aisleriot/rules/poker.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - poker.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define shuffle-mode #f)
 
diff --git a/aisleriot/rules/quatorze.scm b/aisleriot/rules/quatorze.scm
index 5bc5419..176dc71 100644
--- a/aisleriot/rules/quatorze.scm
+++ b/aisleriot/rules/quatorze.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - quatorze.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/royal_east.scm b/aisleriot/rules/royal_east.scm
index 7fdba48..9f9d047 100644
--- a/aisleriot/rules/royal_east.scm
+++ b/aisleriot/rules/royal_east.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - royal_east.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define BASE-VAL 0)
 
diff --git a/aisleriot/rules/saratoga.scm b/aisleriot/rules/saratoga.scm
index d5eebf1..adb32be 100644
--- a/aisleriot/rules/saratoga.scm
+++ b/aisleriot/rules/saratoga.scm
@@ -10,10 +10,10 @@
 ; AisleRiot - klondike.scm
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +21,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/>.
 
 (load "klondike.scm")
 
diff --git a/aisleriot/rules/scorpion.scm b/aisleriot/rules/scorpion.scm
index 326e926..d8a43fd 100644
--- a/aisleriot/rules/scorpion.scm
+++ b/aisleriot/rules/scorpion.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - scorpion.scm
 ; Copyright (C) 1999 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 ; winning game seed: 2036201447
 
 (define (new-game)
diff --git a/aisleriot/rules/scuffle.scm b/aisleriot/rules/scuffle.scm
index a1a6458..b5b53bc 100644
--- a/aisleriot/rules/scuffle.scm
+++ b/aisleriot/rules/scuffle.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - scuffle.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/seahaven.scm b/aisleriot/rules/seahaven.scm
index 02c5bc9..f0dcd29 100644
--- a/aisleriot/rules/seahaven.scm
+++ b/aisleriot/rules/seahaven.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - seahaven.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (def-save-var free-reserves 0)
 
diff --git a/aisleriot/rules/sir_tommy.scm b/aisleriot/rules/sir_tommy.scm
index 5786942..e51b8aa 100644
--- a/aisleriot/rules/sir_tommy.scm
+++ b/aisleriot/rules/sir_tommy.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - sir_tommy.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/spider.scm b/aisleriot/rules/spider.scm
index 817c0a1..faa6c2d 100644
--- a/aisleriot/rules/spider.scm
+++ b/aisleriot/rules/spider.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - spider.scm
 ; Copyright (C) 1998 Jonathan Blandford <jrb mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define suits-one #f)
 (define suits-two #f)
diff --git a/aisleriot/rules/spider_three_decks.scm b/aisleriot/rules/spider_three_decks.scm
index adfec92..67cb535 100644
--- a/aisleriot/rules/spider_three_decks.scm
+++ b/aisleriot/rules/spider_three_decks.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - spider_three_decks.scm
 ; Copyright (C) 2005 Daniel Werner <dw dur ch>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (load "spider.scm")
 
diff --git a/aisleriot/rules/spiderette.scm b/aisleriot/rules/spiderette.scm
index 0a16638..69cc89c 100644
--- a/aisleriot/rules/spiderette.scm
+++ b/aisleriot/rules/spiderette.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - spiderette.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (load "spider.scm")
 
diff --git a/aisleriot/rules/straight_up.scm b/aisleriot/rules/straight_up.scm
index 4ef1efc..b5bdab4 100644
--- a/aisleriot/rules/straight_up.scm
+++ b/aisleriot/rules/straight_up.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - straight_up.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/streets_and_alleys.scm b/aisleriot/rules/streets_and_alleys.scm
index d2e2607..4058be7 100644
--- a/aisleriot/rules/streets_and_alleys.scm
+++ b/aisleriot/rules/streets_and_alleys.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - streets_and_alleys.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/template.scm b/aisleriot/rules/template.scm
index 4535387..ff74fbd 100644
--- a/aisleriot/rules/template.scm
+++ b/aisleriot/rules/template.scm
@@ -1,10 +1,10 @@
 ; AisleRiot -
 ; Copyright (C)
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/ten_across.scm b/aisleriot/rules/ten_across.scm
index ec0b5e4..a1874cb 100644
--- a/aisleriot/rules/ten_across.scm
+++ b/aisleriot/rules/ten_across.scm
@@ -3,10 +3,10 @@
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>
 ; Copyright (C) 1999 James LewisMoss <dres debian org>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,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/>.
 
 (define allow-two-spot-use #t)
 
diff --git a/aisleriot/rules/terrace.scm b/aisleriot/rules/terrace.scm
index 8df08f5..d043d45 100644
--- a/aisleriot/rules/terrace.scm
+++ b/aisleriot/rules/terrace.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - terrace.scm
 ; Copyright (C) 2008 Vincent Povirk <madewokherd gmail com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define reserve-size 11)
 (define tableau-size 9)
diff --git a/aisleriot/rules/thieves.scm b/aisleriot/rules/thieves.scm
index 8ae8082..8541f8a 100644
--- a/aisleriot/rules/thieves.scm
+++ b/aisleriot/rules/thieves.scm
@@ -2,10 +2,10 @@
 ; Copyright (C) 2001 Robert Brady <rwb197 ecs soton ac uk>
 ;                    Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/thirteen.scm b/aisleriot/rules/thirteen.scm
index 7d5b55c..8ef231e 100644
--- a/aisleriot/rules/thirteen.scm
+++ b/aisleriot/rules/thirteen.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - thirteen.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define magic-total 13)
 
diff --git a/aisleriot/rules/thumb_and_pouch.scm b/aisleriot/rules/thumb_and_pouch.scm
index 6ce1ab8..a1b3bba 100644
--- a/aisleriot/rules/thumb_and_pouch.scm
+++ b/aisleriot/rules/thumb_and_pouch.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - thumb_and_pouch.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define tableau '(6 7 8 9 10 11 12))
 (define foundation '(2 3 4 5))
diff --git a/aisleriot/rules/treize.scm b/aisleriot/rules/treize.scm
index a5f4542..c112868 100644
--- a/aisleriot/rules/treize.scm
+++ b/aisleriot/rules/treize.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - treize.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)  
diff --git a/aisleriot/rules/triple_peaks.scm b/aisleriot/rules/triple_peaks.scm
index 34f156d..94691d2 100644
--- a/aisleriot/rules/triple_peaks.scm
+++ b/aisleriot/rules/triple_peaks.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - triple_peaks.scm
 ; Copyright (C) 2005 Richard Hoelscher <rah rahga com>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define progressive-rounds #f)
 (define multiplier-scoring #f)
diff --git a/aisleriot/rules/union_square.scm b/aisleriot/rules/union_square.scm
index 2a30415..68e4ec7 100644
--- a/aisleriot/rules/union_square.scm
+++ b/aisleriot/rules/union_square.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - union_square.scm
 ; Copyright (C) 1999 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/valentine.scm b/aisleriot/rules/valentine.scm
index 0d9a2c2..d9a16fc 100644
--- a/aisleriot/rules/valentine.scm
+++ b/aisleriot/rules/valentine.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - valentine.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/westhaven.scm b/aisleriot/rules/westhaven.scm
index b86569e..662ab9f 100644
--- a/aisleriot/rules/westhaven.scm
+++ b/aisleriot/rules/westhaven.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - westhaven.scm
 ; Copyright (C) 1999 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/whitehead.scm b/aisleriot/rules/whitehead.scm
index 8c29ab3..a6ac9ea 100644
--- a/aisleriot/rules/whitehead.scm
+++ b/aisleriot/rules/whitehead.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - whitehead.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/will_o_the_wisp.scm b/aisleriot/rules/will_o_the_wisp.scm
index 4d00a36..69869e8 100644
--- a/aisleriot/rules/will_o_the_wisp.scm
+++ b/aisleriot/rules/will_o_the_wisp.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - will_o_the_wisp.scm
 ; Copyright (C) 2001 Rosanna Yuen <zana webwynk net>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 
 (load "spider.scm")
diff --git a/aisleriot/rules/yield.scm b/aisleriot/rules/yield.scm
index 2fb7ad4..328471e 100644
--- a/aisleriot/rules/yield.scm
+++ b/aisleriot/rules/yield.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - yield.scm
 ; Copyright (C) 2001, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/yukon.scm b/aisleriot/rules/yukon.scm
index e7c6aff..20f27f7 100644
--- a/aisleriot/rules/yukon.scm
+++ b/aisleriot/rules/yukon.scm
@@ -1,9 +1,9 @@
 ; AisleRiot - yukon.scm
 ; Copyright (C) 1998, 2003 Rosanna Yuen <rwsy mit edu>
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -11,10 +11,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/rules/zebra.scm b/aisleriot/rules/zebra.scm
index d6c293f..e0cba34 100644
--- a/aisleriot/rules/zebra.scm
+++ b/aisleriot/rules/zebra.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - zebra.scm
 ; Copyright (C) 1999, 2003 Rosanna Yuen <rwsy mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (define (new-game)
   (initialize-playing-area)
diff --git a/aisleriot/slot-renderer.c b/aisleriot/slot-renderer.c
index 6a832f3..4a829f9 100644
--- a/aisleriot/slot-renderer.c
+++ b/aisleriot/slot-renderer.c
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2008 Neil Roberts
+ * Copyright © 2008 Neil Roberts
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/slot-renderer.h b/aisleriot/slot-renderer.h
index cf18cb6..e2b564c 100644
--- a/aisleriot/slot-renderer.h
+++ b/aisleriot/slot-renderer.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2008 Neil Roberts
+ * Copyright © 2008 Neil Roberts
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __AISLERIOT_SLOT_RENDERER_H__
diff --git a/aisleriot/sol.c b/aisleriot/sol.c
index faaed11..2e72e2a 100644
--- a/aisleriot/sol.c
+++ b/aisleriot/sol.c
@@ -3,10 +3,10 @@
  * Copyright © 2007 Christian Persch
  * Copyright © 2007 Andreas Røsdal <andreasr gnome org> 
  *
- * This game 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, or (at your option)
- * any later version.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +14,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/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/sol.scm b/aisleriot/sol.scm
index 5b50561..e863819 100644
--- a/aisleriot/sol.scm
+++ b/aisleriot/sol.scm
@@ -1,10 +1,10 @@
 ; AisleRiot - sol.scm
 ; Copyright (C) 1998, 2003 Jonathan Blandford <jrb mit edu>
 ;
-; This game 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, or (at your option)
-; any later version.
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
 ;
 ; This program is distributed in the hope that it will be useful,
 ; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,9 +12,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/>.
 
 (use-modules (ice-9 format))
 
diff --git a/aisleriot/stats-dialog.c b/aisleriot/stats-dialog.c
index ff6dd77..13dbe93 100644
--- a/aisleriot/stats-dialog.c
+++ b/aisleriot/stats-dialog.c
@@ -1,20 +1,19 @@
 /*
- *  Copyright © 2003 Callum McKenzie <callum physics otago ac nz>
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2003 Callum McKenzie <callum physics otago ac nz>
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope stats_dialog it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/stats-dialog.h b/aisleriot/stats-dialog.h
index 4e6bffb..fcff75b 100644
--- a/aisleriot/stats-dialog.h
+++ b/aisleriot/stats-dialog.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope stats_dialog it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_STATS_DIALOG_H
diff --git a/aisleriot/util.c b/aisleriot/util.c
index 5542f42..b72eeed 100644
--- a/aisleriot/util.c
+++ b/aisleriot/util.c
@@ -2,10 +2,10 @@
  * Copyright © 1998, 2001, 2003, 2006 Jonathan Blandford <jrb alum mit edu>
  * Copyright © 2007 Christian Persch
  *
- * This game 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, or (at your option)
- * any later version.
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/util.h b/aisleriot/util.h
index d9dd980..a4d9f00 100644
--- a/aisleriot/util.h
+++ b/aisleriot/util.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef UTIL_H
diff --git a/aisleriot/window.c b/aisleriot/window.c
index e8b9b80..e4a9a4a 100644
--- a/aisleriot/window.c
+++ b/aisleriot/window.c
@@ -1,21 +1,20 @@
 /*
- *  Copyright © 1998, 2003 Jonathan Blandford <jrb alum mit edu>
- *  Copyright © 2003 Callum McKenzie <callum physics otago ac nz>
- *  Copyright © 2007, 2008, 2009 Christian Persch
+ * Copyright © 1998, 2003 Jonathan Blandford <jrb alum mit edu>
+ * Copyright © 2003 Callum McKenzie <callum physics otago ac nz>
+ * Copyright © 2007, 2008, 2009 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope window it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/aisleriot/window.h b/aisleriot/window.h
index 6cd2b1e..a3ac5a9 100644
--- a/aisleriot/window.h
+++ b/aisleriot/window.h
@@ -1,19 +1,18 @@
 /*
- *  Copyright © 2007 Christian Persch
+ * Copyright © 2007 Christian Persch
  *
- *  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, or (at your option)
- *  any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope window it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU 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.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef AISLERIOT_WINDOW_H
diff --git a/libgames-support/games-card-images.c b/libgames-support/games-card-images.c
index 734f8d0..37b1b73 100644
--- a/libgames-support/games-card-images.c
+++ b/libgames-support/games-card-images.c
@@ -1,20 +1,20 @@
 /* 
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-images.h b/libgames-support/games-card-images.h
index 34d31ea..7918cc0 100644
--- a/libgames-support/games-card-images.h
+++ b/libgames-support/games-card-images.h
@@ -2,19 +2,19 @@
   Copyright © 2004 Callum McKenzie
   Copyright © 2007 Christian Persch
 
-  This library is free software; you can redistribute it and'or modify
-  it under the terms of the GNU Library General Public License as published
-  by the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  This library is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Library General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Library General Public License
-  along with this library; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-private.h b/libgames-support/games-card-private.h
index 84580ae..fa3aea1 100644
--- a/libgames-support/games-card-private.h
+++ b/libgames-support/games-card-private.h
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-textures-cache.c b/libgames-support/games-card-textures-cache.c
index 7c53512..ab5df59 100644
--- a/libgames-support/games-card-textures-cache.c
+++ b/libgames-support/games-card-textures-cache.c
@@ -1,20 +1,19 @@
 /*
- *  Copyright © 2008 Neil Roberts
- *  Copyright © 2008 Christian Persch
- *
- *  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, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  Copyright © 2008 Neil Roberts
+  Copyright © 2008 Christian Persch
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgames-support/games-card-textures-cache.h b/libgames-support/games-card-textures-cache.h
index 55b7b52..815bc15 100644
--- a/libgames-support/games-card-textures-cache.h
+++ b/libgames-support/games-card-textures-cache.h
@@ -1,20 +1,19 @@
 /*
- *  Copyright © 2008 Neil Roberts
- *  Copyright © 2008 Christian Persch
- *
- *  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, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  Copyright © 2008 Neil Roberts
+  Copyright © 2008 Christian Persch
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GAMES_CARD_TEXTURES_CACHE_H
diff --git a/libgames-support/games-card-theme-fixed.c b/libgames-support/games-card-theme-fixed.c
index 703fe1a..549f18b 100644
--- a/libgames-support/games-card-theme-fixed.c
+++ b/libgames-support/games-card-theme-fixed.c
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008, 2009 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008, 2009 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-theme-preimage.c b/libgames-support/games-card-theme-preimage.c
index 31c7efe..19c1ef3 100644
--- a/libgames-support/games-card-theme-preimage.c
+++ b/libgames-support/games-card-theme-preimage.c
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-theme-private.h b/libgames-support/games-card-theme-private.h
index 0959db3..13b8b0a 100644
--- a/libgames-support/games-card-theme-private.h
+++ b/libgames-support/games-card-theme-private.h
@@ -1,21 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008, 2009 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008, 2009 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "games-card.h"
 
diff --git a/libgames-support/games-card-theme-pysol.c b/libgames-support/games-card-theme-pysol.c
index e16b545..5333bcc 100644
--- a/libgames-support/games-card-theme-pysol.c
+++ b/libgames-support/games-card-theme-pysol.c
@@ -2,18 +2,19 @@
   Copyright © 2004 Callum McKenzie
   Copyright © 2007, 2008, 2009 Christian Persch
 
-  This programme is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  This programme is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this programme.  If not, see <http://www.gnu.org/licenses/>. */
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include <config.h>
 
diff --git a/libgames-support/games-card-theme-sliced.c b/libgames-support/games-card-theme-sliced.c
index 8ebd923..ee1657d 100644
--- a/libgames-support/games-card-theme-sliced.c
+++ b/libgames-support/games-card-theme-sliced.c
@@ -2,18 +2,19 @@
   Copyright © 2004 Callum McKenzie
   Copyright © 2007, 2008 Christian Persch
 
-  This programme is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  This programme is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with this programme.  If not, see <http://www.gnu.org/licenses/>. */
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-theme-svg.c b/libgames-support/games-card-theme-svg.c
index 60c46d7..7991993 100644
--- a/libgames-support/games-card-theme-svg.c
+++ b/libgames-support/games-card-theme-svg.c
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-theme.c b/libgames-support/games-card-theme.c
index e681915..86c11df 100644
--- a/libgames-support/games-card-theme.c
+++ b/libgames-support/games-card-theme.c
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-theme.h b/libgames-support/games-card-theme.h
index 8e9a2c2..7615f9b 100644
--- a/libgames-support/games-card-theme.h
+++ b/libgames-support/games-card-theme.h
@@ -1,20 +1,20 @@
 /*
   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008, 2009 Christian Persch
+  Copyright © 2007, 2008, 2009 Christian Persch
 
-  This library is free software; you can redistribute it and'or modify
-  it under the terms of the GNU Library General Public License as published
-  by the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  This library is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Library General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Library General Public License
-  along with this library; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-themes.c b/libgames-support/games-card-themes.c
index 4b44bfe..d9c1c54 100644
--- a/libgames-support/games-card-themes.c
+++ b/libgames-support/games-card-themes.c
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008, 2009 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008, 2009 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card-themes.h b/libgames-support/games-card-themes.h
index 38be6ec..8206b23 100644
--- a/libgames-support/games-card-themes.h
+++ b/libgames-support/games-card-themes.h
@@ -1,20 +1,20 @@
 /*
   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008, 2009 Christian Persch
+  Copyright © 2007, 2008, 2009 Christian Persch
 
-  This library is free software; you can redistribute it and'or modify
-  it under the terms of the GNU Library General Public License as published
-  by the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  This library is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Library General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Library General Public License
-  along with this library; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-card.c b/libgames-support/games-card.c
index 3877a60..5d92590 100644
--- a/libgames-support/games-card.c
+++ b/libgames-support/games-card.c
@@ -1,22 +1,20 @@
 /*
-   Copyright © 2007, 2008 Christian Persch
+  Copyright © 2007, 2008 Christian Persch
 
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <config.h>
 
 #include <glib/gi18n.h>
diff --git a/libgames-support/games-card.h b/libgames-support/games-card.h
index 0084a16..1f48c02 100644
--- a/libgames-support/games-card.h
+++ b/libgames-support/games-card.h
@@ -1,20 +1,20 @@
 /*
-   Copyright © 2004 Callum McKenzie
-   Copyright © 2007, 2008 Christian Persch
-
-   This library is free software; you can redistribute it and'or modify
-   it under the terms of the GNU Library General Public License as published 
-   by the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+  Copyright © 2004 Callum McKenzie
+  Copyright © 2007, 2008 Christian Persch
+
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 /* Authors:   Callum McKenzie <callum physics otago ac nz> */
 
diff --git a/libgames-support/games-pixbuf-utils.c b/libgames-support/games-pixbuf-utils.c
index fd0f961..450c233 100644
--- a/libgames-support/games-pixbuf-utils.c
+++ b/libgames-support/games-pixbuf-utils.c
@@ -2,19 +2,18 @@
   Copyright © 1998, 2003 Jonathan Blandford <jrb mit edu>
   Copyright © 2007 Christian Persch
 
-  This library is free software; you can redistribute it and'or modify
-  it under the terms of the GNU Library General Public License as published
-  by the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  This library is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Library General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Library General Public License
-  along with this library; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgames-support/games-pixbuf-utils.h b/libgames-support/games-pixbuf-utils.h
index f4c9115..574bb99 100644
--- a/libgames-support/games-pixbuf-utils.h
+++ b/libgames-support/games-pixbuf-utils.h
@@ -1,19 +1,18 @@
 /*
   Copyright © 2007 Christian Persch
 
-  This library is free software; you can redistribute it and'or modify
-  it under the terms of the GNU Library General Public License as published
-  by the Free Software Foundation; either version 2, or (at your option)
-  any later version.
+  This library is free software: you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
-  This library is distributed in the hope that it will be useful,
+  This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Library General Public License for more details.
+  GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU Library General Public License
-  along with this library; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
     
 #ifndef GAMES_PIXBUF_UTILS_H
diff --git a/libgames-support/games-runtime.c b/libgames-support/games-runtime.c
index f4e998e..8f16879 100644
--- a/libgames-support/games-runtime.c
+++ b/libgames-support/games-runtime.c
@@ -385,12 +385,11 @@ games_runtime_init (const char *name)
   retval = TRUE;
 #endif /* ENABLE_BINRELOC */
 
-#if defined(ENABLE_CARD_THEME_FORMAT_KDE) || defined(ENABLE_CARD_THEME_FORMAT_SLICED) || defined(ENABLE_CARD_THEME_FORMAT_PYSOL)
   if (strcmp (app_name, "aisleriot") == 0 || strcmp (app_name, "blackjack") == 0) {
     gpl_version = 3;
-  } else
-#endif
-  gpl_version = 2;
+  } else {
+    gpl_version = 2;
+  }
 
 #if !GTK_CHECK_VERSION (2, 17, 0)
   gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);
diff --git a/libgames-support/theme-install.ini b/libgames-support/theme-install.ini
index acb4457..ad1ca8a 100644
--- a/libgames-support/theme-install.ini
+++ b/libgames-support/theme-install.ini
@@ -1,18 +1,17 @@
 #  Aisleriot card theme install
 #
-#  This programme is free software; you can redistribute it and'or modify
-#  it under the terms of the GNU General Public License as published
-#  by the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#  This programme is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with this library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # *****************************************************************************
 #



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]