* */*: Update GPL2 to GPL3.

111 files changed, 355 insertions, 618 deletions

diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index 0ad617cc..0f5f23f8 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -11,8 +11,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/README.txt b/contrib/chem/README.txt
index c5751c76..8d682926 100644
--- a/contrib/chem/README.txt
+++ b/contrib/chem/README.txt
@@ -33,8 +33,8 @@ This file is part of `chem', which is part of `groff'.
 
 `groff' is free software; you can redistribute 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.
 
 `groff' is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -42,9 +42,7 @@ 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 `groff'; see the files COPYING and LICENSE in the top
-directory of the `groff' source.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 ####### Emacs settings
diff --git a/contrib/chem/chem.pic b/contrib/chem/chem.pic
index f9521178..01a00549 100644
--- a/contrib/chem/chem.pic
+++ b/contrib/chem/chem.pic
@@ -11,8 +11,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,10 +20,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/chem.pl b/contrib/chem/chem.pl
index e158288f..4ac99abc 100755
--- a/contrib/chem/chem.pl
+++ b/contrib/chem/chem.pl
@@ -12,8 +12,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,10 +21,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 # settings
diff --git a/contrib/chem/examples/122/README b/contrib/chem/examples/122/README
index 1b3b3c36..c31a3464 100644
--- a/contrib/chem/examples/122/README
+++ b/contrib/chem/examples/122/README
@@ -55,8 +55,8 @@ This file is part of `chem', which is part of `groff'.
 
 `groff' is free software; you can redistribute 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.
 
 `groff' is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -64,9 +64,7 @@ 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 `groff'; see the files COPYING and LICENSE in the top
-directory of the `groff' source.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 ####### Emacs settings
diff --git a/contrib/chem/examples/122/ch2a_ethyl.chem b/contrib/chem/examples/122/ch2a_ethyl.chem
index bfadccc8..1484c22f 100644
--- a/contrib/chem/examples/122/ch2a_ethyl.chem
+++ b/contrib/chem/examples/122/ch2a_ethyl.chem
@@ -17,8 +17,8 @@ ch2a_ethyl.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch2a_ethyl.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch2b_benzene.chem b/contrib/chem/examples/122/ch2b_benzene.chem
index f08d6188..565b0abc 100644
--- a/contrib/chem/examples/122/ch2b_benzene.chem
+++ b/contrib/chem/examples/122/ch2b_benzene.chem
@@ -17,8 +17,8 @@ ch2b_benzene.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch2b_benzene.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch2c_benzene_right.chem b/contrib/chem/examples/122/ch2c_benzene_right.chem
index 044ba0d6..02659a8b 100644
--- a/contrib/chem/examples/122/ch2c_benzene_right.chem
+++ b/contrib/chem/examples/122/ch2c_benzene_right.chem
@@ -17,8 +17,8 @@ ch2c_benzene_right.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch2c_benzene_right.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4a_stick.chem b/contrib/chem/examples/122/ch4a_stick.chem
index e8668f00..6f27e0b9 100644
--- a/contrib/chem/examples/122/ch4a_stick.chem
+++ b/contrib/chem/examples/122/ch4a_stick.chem
@@ -17,8 +17,8 @@ ch4a_stick.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4a_stick.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4b_methyl_acetate.chem b/contrib/chem/examples/122/ch4b_methyl_acetate.chem
index e48640ef..5aef328c 100644
--- a/contrib/chem/examples/122/ch4b_methyl_acetate.chem
+++ b/contrib/chem/examples/122/ch4b_methyl_acetate.chem
@@ -17,8 +17,8 @@ ch4b_methyl_acetate.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4b_methyl_acetate.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4c_colon.chem b/contrib/chem/examples/122/ch4c_colon.chem
index 588c3cb3..1b427386 100644
--- a/contrib/chem/examples/122/ch4c_colon.chem
+++ b/contrib/chem/examples/122/ch4c_colon.chem
@@ -17,8 +17,8 @@ ch4c_colon.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4c_colon.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4d_HCl.H2O.chem b/contrib/chem/examples/122/ch4d_HCl.H2O.chem
index a576dcf2..0ebc6c52 100644
--- a/contrib/chem/examples/122/ch4d_HCl.H2O.chem
+++ b/contrib/chem/examples/122/ch4d_HCl.H2O.chem
@@ -17,8 +17,8 @@ ch4d_HCl.H2O.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4d_HCl.H2O.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4e_CaSO4.2H2O.chem b/contrib/chem/examples/122/ch4e_CaSO4.2H2O.chem
index 28462231..6283c215 100644
--- a/contrib/chem/examples/122/ch4e_CaSO4.2H2O.chem
+++ b/contrib/chem/examples/122/ch4e_CaSO4.2H2O.chem
@@ -17,8 +17,8 @@ ch4e_CaSO4.2H2O.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4e_CaSO4.2H2O.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4f_C.chem b/contrib/chem/examples/122/ch4f_C.chem
index 66e46016..6ca3bbb9 100644
--- a/contrib/chem/examples/122/ch4f_C.chem
+++ b/contrib/chem/examples/122/ch4f_C.chem
@@ -17,8 +17,8 @@ ch4f_C.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4f_C.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4g_BP.chem b/contrib/chem/examples/122/ch4g_BP.chem
index 2dc69ed9..6f321323 100644
--- a/contrib/chem/examples/122/ch4g_BP.chem
+++ b/contrib/chem/examples/122/ch4g_BP.chem
@@ -17,8 +17,8 @@ ch4g_BP.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4g_BP.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4h_methacrylate.chem b/contrib/chem/examples/122/ch4h_methacrylate.chem
index ddf7f59f..3032e64e 100644
--- a/contrib/chem/examples/122/ch4h_methacrylate.chem
+++ b/contrib/chem/examples/122/ch4h_methacrylate.chem
@@ -17,8 +17,8 @@ ch4h_methacrylate.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4h_methacrylate.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4i_cyclo.chem b/contrib/chem/examples/122/ch4i_cyclo.chem
index 7d8ac92d..441e52ee 100644
--- a/contrib/chem/examples/122/ch4i_cyclo.chem
+++ b/contrib/chem/examples/122/ch4i_cyclo.chem
@@ -17,8 +17,8 @@ ch4i_cyclo.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4i_cyclo.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4j_ring4.chem b/contrib/chem/examples/122/ch4j_ring4.chem
index d582e659..0c15003e 100644
--- a/contrib/chem/examples/122/ch4j_ring4.chem
+++ b/contrib/chem/examples/122/ch4j_ring4.chem
@@ -17,8 +17,8 @@ ch4j_ring4.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4j_ring4.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4k_ring3.chem b/contrib/chem/examples/122/ch4k_ring3.chem
index 52559eb4..8f084aae 100644
--- a/contrib/chem/examples/122/ch4k_ring3.chem
+++ b/contrib/chem/examples/122/ch4k_ring3.chem
@@ -17,8 +17,8 @@ ch4k_ring3.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4k_ring3.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4l_vertex.chem b/contrib/chem/examples/122/ch4l_vertex.chem
index 1c58cdfc..c2678a70 100644
--- a/contrib/chem/examples/122/ch4l_vertex.chem
+++ b/contrib/chem/examples/122/ch4l_vertex.chem
@@ -17,8 +17,8 @@ ch4l_vertex.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4l_vertex.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4m_double.chem b/contrib/chem/examples/122/ch4m_double.chem
index 82f57775..ab8de659 100644
--- a/contrib/chem/examples/122/ch4m_double.chem
+++ b/contrib/chem/examples/122/ch4m_double.chem
@@ -17,8 +17,8 @@ ch4m_double.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4m_double.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4n_triple.chem b/contrib/chem/examples/122/ch4n_triple.chem
index ba2fc390..0b2c76c0 100644
--- a/contrib/chem/examples/122/ch4n_triple.chem
+++ b/contrib/chem/examples/122/ch4n_triple.chem
@@ -17,8 +17,8 @@ ch4n_triple.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4n_triple.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4o_aromatic.chem b/contrib/chem/examples/122/ch4o_aromatic.chem
index 1539c552..b76c8f6b 100644
--- a/contrib/chem/examples/122/ch4o_aromatic.chem
+++ b/contrib/chem/examples/122/ch4o_aromatic.chem
@@ -17,8 +17,8 @@ ch4o_aromatic.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4o_aromatic.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4p_cholestanol.chem b/contrib/chem/examples/122/ch4p_cholestanol.chem
index 692aaf25..747445f5 100644
--- a/contrib/chem/examples/122/ch4p_cholestanol.chem
+++ b/contrib/chem/examples/122/ch4p_cholestanol.chem
@@ -17,8 +17,8 @@ ch4p_cholestanol.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4p_cholestanol.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4q_rings.chem b/contrib/chem/examples/122/ch4q_rings.chem
index ff5eaa1f..9c8e358b 100644
--- a/contrib/chem/examples/122/ch4q_rings.chem
+++ b/contrib/chem/examples/122/ch4q_rings.chem
@@ -17,8 +17,8 @@ ch4q_rings.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4q_rings.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4r_spiro.chem b/contrib/chem/examples/122/ch4r_spiro.chem
index f3f929cb..be32fbf2 100644
--- a/contrib/chem/examples/122/ch4r_spiro.chem
+++ b/contrib/chem/examples/122/ch4r_spiro.chem
@@ -17,8 +17,8 @@ ch4r_spiro.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4r_spiro.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4s_heteroatoms.chem b/contrib/chem/examples/122/ch4s_heteroatoms.chem
index a6ffb0b0..58c0ae80 100644
--- a/contrib/chem/examples/122/ch4s_heteroatoms.chem
+++ b/contrib/chem/examples/122/ch4s_heteroatoms.chem
@@ -17,8 +17,8 @@ ch4s_heteroatoms.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4s_heteroatoms.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4t_polycyclic.chem b/contrib/chem/examples/122/ch4t_polycyclic.chem
index 64e2860e..9432595e 100644
--- a/contrib/chem/examples/122/ch4t_polycyclic.chem
+++ b/contrib/chem/examples/122/ch4t_polycyclic.chem
@@ -17,8 +17,8 @@ ch4t_polycyclic.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4t_polycyclic.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4u_nicotine.chem b/contrib/chem/examples/122/ch4u_nicotine.chem
index a59dd56c..67311cf1 100644
--- a/contrib/chem/examples/122/ch4u_nicotine.chem
+++ b/contrib/chem/examples/122/ch4u_nicotine.chem
@@ -17,8 +17,8 @@ ch4u_nicotine.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4u_nicotine.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4v_histidine.chem b/contrib/chem/examples/122/ch4v_histidine.chem
index f4a37969..7d3cac9f 100644
--- a/contrib/chem/examples/122/ch4v_histidine.chem
+++ b/contrib/chem/examples/122/ch4v_histidine.chem
@@ -17,8 +17,8 @@ ch4v_histidine.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4v_histidine.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4w_lsd.chem b/contrib/chem/examples/122/ch4w_lsd.chem
index 1e83f59a..390f2e5a 100644
--- a/contrib/chem/examples/122/ch4w_lsd.chem
+++ b/contrib/chem/examples/122/ch4w_lsd.chem
@@ -17,8 +17,8 @@ ch4w_lsd.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4w_lsd.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4x_anisole.chem b/contrib/chem/examples/122/ch4x_anisole.chem
index ca613e11..61f382fb 100644
--- a/contrib/chem/examples/122/ch4x_anisole.chem
+++ b/contrib/chem/examples/122/ch4x_anisole.chem
@@ -17,8 +17,8 @@ ch4x_anisole.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4x_anisole.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4y_reserpine.chem b/contrib/chem/examples/122/ch4y_reserpine.chem
index c2c34cd1..7105e0ff 100644
--- a/contrib/chem/examples/122/ch4y_reserpine.chem
+++ b/contrib/chem/examples/122/ch4y_reserpine.chem
@@ -18,8 +18,8 @@ ch4y_reserpine.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,10 +27,7 @@ ch4y_reserpine.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4z1_eqn_glutamic.chem b/contrib/chem/examples/122/ch4z1_eqn_glutamic.chem
index bed5dc35..c0560daa 100644
--- a/contrib/chem/examples/122/ch4z1_eqn_glutamic.chem
+++ b/contrib/chem/examples/122/ch4z1_eqn_glutamic.chem
@@ -21,8 +21,8 @@ delim $$
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,10 +30,7 @@ delim $$
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch4z2_text.chem b/contrib/chem/examples/122/ch4z2_text.chem
index ad650701..84044095 100644
--- a/contrib/chem/examples/122/ch4z2_text.chem
+++ b/contrib/chem/examples/122/ch4z2_text.chem
@@ -17,8 +17,8 @@ ch4z2_text.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch4z2_text.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch5a_size.chem b/contrib/chem/examples/122/ch5a_size.chem
index 8a3da621..18b31284 100644
--- a/contrib/chem/examples/122/ch5a_size.chem
+++ b/contrib/chem/examples/122/ch5a_size.chem
@@ -17,8 +17,8 @@ ch5a_size.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch5a_size.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch6a_pic.chem b/contrib/chem/examples/122/ch6a_pic.chem
index 556a5a60..c6478fe8 100644
--- a/contrib/chem/examples/122/ch6a_pic.chem
+++ b/contrib/chem/examples/122/ch6a_pic.chem
@@ -17,8 +17,8 @@ ch6a_pic.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch6a_pic.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/ch6b_dna.chem b/contrib/chem/examples/122/ch6b_dna.chem
index afc9aad4..2ab61c97 100644
--- a/contrib/chem/examples/122/ch6b_dna.chem
+++ b/contrib/chem/examples/122/ch6b_dna.chem
@@ -17,8 +17,8 @@ ch6b_dna.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ch6b_dna.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAa_polymer.chem b/contrib/chem/examples/122/chAa_polymer.chem
index a3372e83..64ef7eba 100644
--- a/contrib/chem/examples/122/chAa_polymer.chem
+++ b/contrib/chem/examples/122/chAa_polymer.chem
@@ -17,8 +17,8 @@ chAa_polymer.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chAa_polymer.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAb_vinyl_chloro.chem b/contrib/chem/examples/122/chAb_vinyl_chloro.chem
index 07a657b9..a8817fa9 100644
--- a/contrib/chem/examples/122/chAb_vinyl_chloro.chem
+++ b/contrib/chem/examples/122/chAb_vinyl_chloro.chem
@@ -17,8 +17,8 @@ chAb_vinyl_chloro.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chAb_vinyl_chloro.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAc_morphine.chem b/contrib/chem/examples/122/chAc_morphine.chem
index 9d37ebb1..bd82f612 100644
--- a/contrib/chem/examples/122/chAc_morphine.chem
+++ b/contrib/chem/examples/122/chAc_morphine.chem
@@ -17,8 +17,8 @@ chAc_morphine.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chAc_morphine.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAd_chlorophyll.chem b/contrib/chem/examples/122/chAd_chlorophyll.chem
index 90b9ab69..b6b2254a 100644
--- a/contrib/chem/examples/122/chAd_chlorophyll.chem
+++ b/contrib/chem/examples/122/chAd_chlorophyll.chem
@@ -17,8 +17,8 @@ chAd_chlorophyll.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chAd_chlorophyll.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAe_chair.chem b/contrib/chem/examples/122/chAe_chair.chem
index a5d57eea..efecfebc 100644
--- a/contrib/chem/examples/122/chAe_chair.chem
+++ b/contrib/chem/examples/122/chAe_chair.chem
@@ -17,8 +17,8 @@ chAe_chair.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chAe_chair.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAf_arrow.chem b/contrib/chem/examples/122/chAf_arrow.chem
index 8aa28f4c..c8acc660 100644
--- a/contrib/chem/examples/122/chAf_arrow.chem
+++ b/contrib/chem/examples/122/chAf_arrow.chem
@@ -20,8 +20,8 @@ delim $$
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,10 +29,7 @@ delim $$
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAg_circle.chem b/contrib/chem/examples/122/chAg_circle.chem
index c8ad0311..f53c2516 100644
--- a/contrib/chem/examples/122/chAg_circle.chem
+++ b/contrib/chem/examples/122/chAg_circle.chem
@@ -17,8 +17,8 @@ chAg_circle.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chAg_circle.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAh_brackets.chem b/contrib/chem/examples/122/chAh_brackets.chem
index cc2ccbd2..a33e31d8 100644
--- a/contrib/chem/examples/122/chAh_brackets.chem
+++ b/contrib/chem/examples/122/chAh_brackets.chem
@@ -20,8 +20,8 @@ delim $$
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,10 +29,7 @@ delim $$
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chAi_poly_vinyl_chloride.chem b/contrib/chem/examples/122/chAi_poly_vinyl_chloride.chem
index 7b73a59c..d463495d 100644
--- a/contrib/chem/examples/122/chAi_poly_vinyl_chloride.chem
+++ b/contrib/chem/examples/122/chAi_poly_vinyl_chloride.chem
@@ -18,8 +18,8 @@ chAi_poly_vinyl_chloride.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,10 +27,7 @@ chAi_poly_vinyl_chloride.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chBa_jump.chem b/contrib/chem/examples/122/chBa_jump.chem
index 343c0590..2adf75f8 100644
--- a/contrib/chem/examples/122/chBa_jump.chem
+++ b/contrib/chem/examples/122/chBa_jump.chem
@@ -17,8 +17,8 @@ chBa_jump.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chBa_jump.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chBb_bonds.chem b/contrib/chem/examples/122/chBb_bonds.chem
index a14743fd..0cf7b92c 100644
--- a/contrib/chem/examples/122/chBb_bonds.chem
+++ b/contrib/chem/examples/122/chBb_bonds.chem
@@ -17,8 +17,8 @@ chBb_bonds.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chBb_bonds.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/122/chBc_rings.chem b/contrib/chem/examples/122/chBc_rings.chem
index 01822937..e6b2fbeb 100644
--- a/contrib/chem/examples/122/chBc_rings.chem
+++ b/contrib/chem/examples/122/chBc_rings.chem
@@ -17,8 +17,8 @@ chBc_rings.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ chBc_rings.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/chem/examples/README.txt b/contrib/chem/examples/README.txt
index 2e2da232..09131fa4 100644
--- a/contrib/chem/examples/README.txt
+++ b/contrib/chem/examples/README.txt
@@ -46,8 +46,8 @@ This file is part of `chem', which is part of `groff'.
 
 `groff' is free software; you can redistribute 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.
 
 `groff' is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -55,9 +55,7 @@ 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 `groff'; see the files COPYING and LICENSE in the top
-directory of the `groff' source.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 ####### Emacs settings
diff --git a/contrib/chem/examples/atp.chem b/contrib/chem/examples/atp.chem
index ee4c7945..6bb7d7fc 100644
--- a/contrib/chem/examples/atp.chem
+++ b/contrib/chem/examples/atp.chem
@@ -20,8 +20,8 @@ atp.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,10 +29,7 @@ atp.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 R1:	ring5 pointing left double 1,2 3,4 put N at 2 put N at 5
 B:	benzene put N at 2 with .V6 at R1.V3 with .V5 at R1.V4
diff --git a/contrib/chem/examples/cholesterin.chem b/contrib/chem/examples/cholesterin.chem
index 0fea3919..ae55df2f 100644
--- a/contrib/chem/examples/cholesterin.chem
+++ b/contrib/chem/examples/cholesterin.chem
@@ -18,8 +18,8 @@ cholesterin.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,10 +27,7 @@ cholesterin.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 R1:	ring6
 	bond -120 ; HO
diff --git a/contrib/chem/examples/ethamivan.chem b/contrib/chem/examples/ethamivan.chem
index 4dc3afe0..859b5de6 100644
--- a/contrib/chem/examples/ethamivan.chem
+++ b/contrib/chem/examples/ethamivan.chem
@@ -17,8 +17,8 @@ ethamivan.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ ethamivan.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 R:	ring pointing left double 2,3 4,5 6,1
 	bond left from R.V1 ; O
diff --git a/contrib/chem/examples/lsd.chem b/contrib/chem/examples/lsd.chem
index f5d87b64..338d5eef 100644
--- a/contrib/chem/examples/lsd.chem
+++ b/contrib/chem/examples/lsd.chem
@@ -17,8 +17,8 @@ lsd.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ lsd.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 F:	flatring5 pointing left put N at 5 double 3,4
 	H below F.N
diff --git a/contrib/chem/examples/morphine.chem b/contrib/chem/examples/morphine.chem
index faa83628..d8efa6e0 100644
--- a/contrib/chem/examples/morphine.chem
+++ b/contrib/chem/examples/morphine.chem
@@ -19,8 +19,8 @@ morphine.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -28,10 +28,7 @@ morphine.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 R1:	benzene
 R2:	benzene with .V6 at R1.V2 with .V5 at R1.V3 put N at 4
diff --git a/contrib/chem/examples/penicillin.chem b/contrib/chem/examples/penicillin.chem
index 0e8ad219..dd800bde 100644
--- a/contrib/chem/examples/penicillin.chem
+++ b/contrib/chem/examples/penicillin.chem
@@ -20,8 +20,8 @@ penicillin.chem:
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,10 +29,7 @@ penicillin.chem:
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 R1:	flatring5 pointing up put S at 1 put N at 4
 	bond 45 at R1.V2
diff --git a/contrib/chem/examples/reserpine.chem b/contrib/chem/examples/reserpine.chem
index f18357e4..09e2e27a 100644
--- a/contrib/chem/examples/reserpine.chem
+++ b/contrib/chem/examples/reserpine.chem
@@ -17,8 +17,8 @@ begin chem
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,10 +26,7 @@ begin chem
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 R1:	benzene pointing up
 	bond -120 from R1.V5 ; O
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index d4138907..304ec551 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -5,17 +5,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 #
 # Makefile.sub
 #
diff --git a/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub
index 2230803b..9fd13daa 100644
--- a/contrib/gdiffmk/Makefile.sub
+++ b/contrib/gdiffmk/Makefile.sub
@@ -11,8 +11,8 @@
 
 # groff is free software; you can redistribute 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.
 
 # groff is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -20,9 +20,7 @@
 # License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with groff; see the files COPYING and LICENSE in the top
-# directory of the groff source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/gdiffmk/README b/contrib/gdiffmk/README
index 9428717e..e3b8f4fa 100644
--- a/contrib/gdiffmk/README
+++ b/contrib/gdiffmk/README
@@ -32,8 +32,8 @@ This file is part of the gdiffmk utility, which is part of groff.
 
 groff is free software; you can redistribute 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.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
diff --git a/contrib/gdiffmk/gdiffmk.man b/contrib/gdiffmk/gdiffmk.man
index 8cfd7124..d067b5d3 100644
--- a/contrib/gdiffmk/gdiffmk.man
+++ b/contrib/gdiffmk/gdiffmk.man
@@ -255,8 +255,8 @@ Copyright \(co 2004, 2005, 2008 Free Software Foundation, Inc.
 .B gdiffmk
 is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 .
 .LP
 .B gdiffmk
@@ -266,10 +266,8 @@ FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU General Public License for more details.
 .
 .LP
-You should have received a copy of the GNU General Public License along
-with groff; see the file COPYING.
-If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 .
 .
 .SH "SEE ALSO"
diff --git a/contrib/gdiffmk/gdiffmk.sh b/contrib/gdiffmk/gdiffmk.sh
index e55eb696..3bd5d240 100644
--- a/contrib/gdiffmk/gdiffmk.sh
+++ b/contrib/gdiffmk/gdiffmk.sh
@@ -6,8 +6,8 @@
 
 # groff is free software; you can redistribute 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.
 
 # groff is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -15,9 +15,7 @@
 # License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with groff; see the files COPYING and LICENSE in the top
-# directory of the groff source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 # This file is part of GNU gdiffmk.
 
 
diff --git a/contrib/gdiffmk/tests/runtests.in b/contrib/gdiffmk/tests/runtests.in
index 480a05e8..e4156ecc 100644
--- a/contrib/gdiffmk/tests/runtests.in
+++ b/contrib/gdiffmk/tests/runtests.in
@@ -9,8 +9,8 @@
 
 # groff is free software; you can redistribute 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.
 
 # groff is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -18,9 +18,7 @@
 # License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with groff; see the files COPYING and LICENSE in the top
-# directory of the groff source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 # This file is part of GNU gdiffmk.
 
 srcdir=@srcdir@
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index 6e79776c..a82556cd 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -5,17 +5,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 #
 # Makefile.sub
 #
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 102d8232..c2dd1eae 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -11,8 +11,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,9 +20,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/README b/contrib/groffer/README
index a8384a0a..2d854e95 100644
--- a/contrib/groffer/README
+++ b/contrib/groffer/README
@@ -103,8 +103,8 @@ This file is part of `groffer', which is part of `groff'.
 
 `groff' is free software; you can redistribute 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.
 
 `groff' is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -112,9 +112,7 @@ 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 `groff'; see the files COPYING and LICENSE in the top
-directory of the `groff' source.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 ####### Emacs settings
diff --git a/contrib/groffer/perl/README_PERL b/contrib/groffer/perl/README_PERL
index cb69c2e8..f6a1afde 100644
--- a/contrib/groffer/perl/README_PERL
+++ b/contrib/groffer/perl/README_PERL
@@ -241,8 +241,8 @@ This file is part of `groffer', which is part of `groff'.
 
 `groff' is free software; you can redistribute 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.
 
 `groff' is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -250,9 +250,7 @@ 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 `groff'; see the files COPYING and LICENSE in the top
-directory of the `groff' source.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 Last update: 12 Oct 2006
 
diff --git a/contrib/groffer/perl/func.pl b/contrib/groffer/perl/func.pl
index 0f8e801c..b7cabfd0 100644
--- a/contrib/groffer/perl/func.pl
+++ b/contrib/groffer/perl/func.pl
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/perl/groffer.man b/contrib/groffer/perl/groffer.man
index 48d22c48..6be9b9da 100644
--- a/contrib/groffer/perl/groffer.man
+++ b/contrib/groffer/perl/groffer.man
@@ -38,7 +38,7 @@ as published by the
 .nh
 .BR "Free Software Foundation" ,
 .hy
-either version 2, or (at your option) any later version.
+either version 3 of the License, or (at your option) any later version.
 .
 .P
 You should have received a copy of the \f[CR]GNU General Public
@@ -52,10 +52,9 @@ source package.
 Or read the
 .I man\~page
 .BR gpl (1).
-You can also write to the
+You can also visit
 .nh
-.B Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
-.BR "MA 02110-1301, USA" .
+.B <http://www.gnu.org/licenses/>.
 .hy
 ..
 .
diff --git a/contrib/groffer/perl/groffer.pl b/contrib/groffer/perl/groffer.pl
index 95ceca65..1a965e0f 100755
--- a/contrib/groffer/perl/groffer.pl
+++ b/contrib/groffer/perl/groffer.pl
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/perl/man.pl b/contrib/groffer/perl/man.pl
index 3cb2289e..356d089a 100644
--- a/contrib/groffer/perl/man.pl
+++ b/contrib/groffer/perl/man.pl
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/perl/perl_test.pl b/contrib/groffer/perl/perl_test.pl
index 816f19da..1f5e078d 100644
--- a/contrib/groffer/perl/perl_test.pl
+++ b/contrib/groffer/perl/perl_test.pl
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/perl/roff2.pl b/contrib/groffer/perl/roff2.pl
index 5f5ed1ad..7751dc4e 100755
--- a/contrib/groffer/perl/roff2.pl
+++ b/contrib/groffer/perl/roff2.pl
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/perl/split_env.sh b/contrib/groffer/perl/split_env.sh
index dfbbadf4..6c967028 100644
--- a/contrib/groffer/perl/split_env.sh
+++ b/contrib/groffer/perl/split_env.sh
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/shell/README_SH b/contrib/groffer/shell/README_SH
index fbd0e43d..5791bd2e 100644
--- a/contrib/groffer/shell/README_SH
+++ b/contrib/groffer/shell/README_SH
@@ -277,8 +277,8 @@ This file is part of `groffer', which is part of `groff'.
 
 `groff' is free software; you can redistribute 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.
 
 `groff' is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -286,9 +286,7 @@ 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 `groff'; see the files COPYING and LICENSE in the top
-directory of the `groff' source.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 ####### Emacs settings
diff --git a/contrib/groffer/shell/groffer.man b/contrib/groffer/shell/groffer.man
index 48095aae..62ec5873 100644
--- a/contrib/groffer/shell/groffer.man
+++ b/contrib/groffer/shell/groffer.man
@@ -39,7 +39,7 @@ as published by the
 .nh
 .BR "Free Software Foundation" ,
 .hy
-either version 2, or (at your option) any later version.
+either version 3 of the License, or (at your option) any later version.
 .
 .P
 You should have received a copy of the \f[CR]GNU General Public
@@ -53,10 +53,9 @@ source package.
 Or read the
 .I man\~page
 .BR gpl (1).
-You can also write to the
+You can also visit
 .nh
-.B Free Software Foundation, 51 Franklin St - Fifth Floor, Boston,
-.BR "MA 02110-1301, USA" .
+.B <http://www.gnu.org/licenses/>.
 .hy
 ..
 .
diff --git a/contrib/groffer/shell/groffer.sh b/contrib/groffer/shell/groffer.sh
index 8e495cfc..05858de0 100755
--- a/contrib/groffer/shell/groffer.sh
+++ b/contrib/groffer/shell/groffer.sh
@@ -15,8 +15,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,10 +24,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/shell/groffer2.sh b/contrib/groffer/shell/groffer2.sh
index 358eb317..867ef351 100644
--- a/contrib/groffer/shell/groffer2.sh
+++ b/contrib/groffer/shell/groffer2.sh
@@ -18,8 +18,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,10 +27,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 
 ########################################################################
diff --git a/contrib/groffer/shell/roff2.sh b/contrib/groffer/shell/roff2.sh
index 47197c3b..50084a74 100755
--- a/contrib/groffer/shell/roff2.sh
+++ b/contrib/groffer/shell/roff2.sh
@@ -14,8 +14,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +23,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index df021908..a822ed43 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -13,8 +13,8 @@
 
 # `groff' is free software; you can redistribute 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.
 
 # `groff' is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -22,10 +22,7 @@
 # General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with `groff'; see the files COPYING and LICENSE in the top
-# directory of the `groff' source.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301,
-# USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ########################################################################
 
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index 9d21122f..52138a6a 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -5,17 +5,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 # These may be overridden if cross-compiling.
 GROFFBIN=$(top_builddir)/src/roff/groff/groff
diff --git a/contrib/hdtbl/examples/chess_board.roff b/contrib/hdtbl/examples/chess_board.roff
index de9cbeac..868f4318 100644
--- a/contrib/hdtbl/examples/chess_board.roff
+++ b/contrib/hdtbl/examples/chess_board.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/col_rowspan_colors.roff b/contrib/hdtbl/examples/col_rowspan_colors.roff
index a6c17a69..43aa40ce 100644
--- a/contrib/hdtbl/examples/col_rowspan_colors.roff
+++ b/contrib/hdtbl/examples/col_rowspan_colors.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/color_boxes.roff b/contrib/hdtbl/examples/color_boxes.roff
index d49d1903..77a158e7 100644
--- a/contrib/hdtbl/examples/color_boxes.roff
+++ b/contrib/hdtbl/examples/color_boxes.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/color_nested_tables.roff b/contrib/hdtbl/examples/color_nested_tables.roff
index 91bcaa5b..db2f8b54 100644
--- a/contrib/hdtbl/examples/color_nested_tables.roff
+++ b/contrib/hdtbl/examples/color_nested_tables.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/color_table_cells.roff b/contrib/hdtbl/examples/color_table_cells.roff
index 5b1c71e2..03c4d70e 100644
--- a/contrib/hdtbl/examples/color_table_cells.roff
+++ b/contrib/hdtbl/examples/color_table_cells.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/color_transitions.roff b/contrib/hdtbl/examples/color_transitions.roff
index fa8d2240..36e405d2 100644
--- a/contrib/hdtbl/examples/color_transitions.roff
+++ b/contrib/hdtbl/examples/color_transitions.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/fonts_n.in b/contrib/hdtbl/examples/fonts_n.in
index f6146f04..406aa46f 100644
--- a/contrib/hdtbl/examples/fonts_n.in
+++ b/contrib/hdtbl/examples/fonts_n.in
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/fonts_x.in b/contrib/hdtbl/examples/fonts_x.in
index 25015bad..526d37f4 100644
--- a/contrib/hdtbl/examples/fonts_x.in
+++ b/contrib/hdtbl/examples/fonts_x.in
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/mixed_pickles.roff b/contrib/hdtbl/examples/mixed_pickles.roff
index 04047fa1..07f18fd4 100644
--- a/contrib/hdtbl/examples/mixed_pickles.roff
+++ b/contrib/hdtbl/examples/mixed_pickles.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/rainbow.roff b/contrib/hdtbl/examples/rainbow.roff
index 14d2176f..3e681ea2 100644
--- a/contrib/hdtbl/examples/rainbow.roff
+++ b/contrib/hdtbl/examples/rainbow.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/examples/short_reference.roff b/contrib/hdtbl/examples/short_reference.roff
index a21a9165..7e18db9d 100644
--- a/contrib/hdtbl/examples/short_reference.roff
+++ b/contrib/hdtbl/examples/short_reference.roff
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/hdmisc.tmac b/contrib/hdtbl/hdmisc.tmac
index 2e90a625..35978322 100644
--- a/contrib/hdtbl/hdmisc.tmac
+++ b/contrib/hdtbl/hdmisc.tmac
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/hdtbl/hdtbl.tmac b/contrib/hdtbl/hdtbl.tmac
index b59a5d00..3293330e 100644
--- a/contrib/hdtbl/hdtbl.tmac
+++ b/contrib/hdtbl/hdtbl.tmac
@@ -10,8 +10,8 @@ written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,7 @@ 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 groff; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin St - Fifth Floor, Boston, MA
-02110-1301, USA.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 ..
 .
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index 58097118..7cf9fe70 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -4,17 +4,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 #
 # Makefile.sim
 #
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index 88446b95..224e30db 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -4,17 +4,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 #
 # Makefile.sub
 #
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 76dab4eb..b6ffb8a9 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3,8 +3,8 @@
 .ds RE \\$2
 ..
 .\"
-.\" $Id: m.tmac,v 2.34 2008/09/22 17:14:31 wl Exp $
-.@revision $Revision: 2.34 $
+.\" $Id: m.tmac,v 2.35 2009/01/04 14:50:58 wl Exp $
+.@revision $Revision: 2.35 $
 .ig
 
 Copyright (C) 1991-2000, 2001, 2002, 2003, 2004, 2005, 2006
@@ -13,17 +13,16 @@ mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 mgm 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 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/>.
 
 Please send bugreports with examples to jh@axis.com.
 
diff --git a/contrib/mm/mm/0.MT b/contrib/mm/mm/0.MT
index 3e123640..483b85eb 100644
--- a/contrib/mm/mm/0.MT
+++ b/contrib/mm/mm/0.MT
@@ -6,17 +6,16 @@ mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 mgm 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 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/>.
 
 Please send bugreports with examples to jh@axis.com.
 ..
diff --git a/contrib/mm/mm/4.MT b/contrib/mm/mm/4.MT
index a686ccca..3edc8db2 100644
--- a/contrib/mm/mm/4.MT
+++ b/contrib/mm/mm/4.MT
@@ -6,17 +6,16 @@ mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 mgm 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 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/>.
 
 Please send bugreports with examples to jh@axis.com.
 ..
diff --git a/contrib/mm/mm/5.MT b/contrib/mm/mm/5.MT
index 031e36b8..21e0a7cd 100644
--- a/contrib/mm/mm/5.MT
+++ b/contrib/mm/mm/5.MT
@@ -6,17 +6,16 @@ mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 mgm 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 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/>.
 
 Please send bugreports with examples to jh@axis.com.
 ..
diff --git a/contrib/mm/mm/ms.cov b/contrib/mm/mm/ms.cov
index 99cb1199..49ce1fa8 100644
--- a/contrib/mm/mm/ms.cov
+++ b/contrib/mm/mm/ms.cov
@@ -6,17 +6,16 @@ mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 mgm 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 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/>.
 
 Please send bugreports with examples to jh@axis.com.
 ..
diff --git a/contrib/mm/mmroff.pl b/contrib/mm/mmroff.pl
index ab25b745..d464e0e2 100644
--- a/contrib/mm/mmroff.pl
+++ b/contrib/mm/mmroff.pl
@@ -7,17 +7,16 @@
 #
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 use strict;
 # runs groff in safe mode, that seems to be the default
diff --git a/contrib/mm/mse.tmac b/contrib/mm/mse.tmac
index dd4f0948..cb0c2b9f 100644
--- a/contrib/mm/mse.tmac
+++ b/contrib/mm/mse.tmac
@@ -6,17 +6,16 @@ mgm is written by Jörgen Hägg <jh@axis.com>
 
 mgm is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 mgm 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 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/>.
 
 Please send bugreports with examples to jh@axis.com.
 ..
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index d14db4b6..639100f7 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -6,17 +6,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 # These may be overridden if cross-compiling.
 GROFFBIN=$(top_builddir)/src/roff/groff/groff
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index 7374f936..d01ffff6 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -10,17 +10,16 @@ This file is part of groff.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 Version 1.5-c
 -------------
diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
index 1b2e856b..850ba0b8 100644
--- a/contrib/pdfmark/Makefile.sub
+++ b/contrib/pdfmark/Makefile.sub
@@ -5,17 +5,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 MAN1=\
   pdfroff.n
diff --git a/contrib/pdfmark/pdfmark.tmac b/contrib/pdfmark/pdfmark.tmac
index 2f5c9996..85fe37a8 100644
--- a/contrib/pdfmark/pdfmark.tmac
+++ b/contrib/pdfmark/pdfmark.tmac
@@ -11,17 +11,16 @@ This file is part of groff.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 Author's Note
 =============
diff --git a/contrib/pdfmark/pdfroff.sh b/contrib/pdfmark/pdfroff.sh
index a23bba55..eab012df 100644
--- a/contrib/pdfmark/pdfroff.sh
+++ b/contrib/pdfmark/pdfroff.sh
@@ -10,17 +10,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 #
 # ------------------------------------------------------------------------------
 #
@@ -628,4 +627,4 @@
   $SAY >&2 ". done"
 #
 # ------------------------------------------------------------------------------
-# $RCSfile: pdfroff.sh,v $ $Revision: 1.13 $: end of file
+# $RCSfile: pdfroff.sh,v $ $Revision: 1.14 $: end of file
diff --git a/contrib/pdfmark/spdf.tmac b/contrib/pdfmark/spdf.tmac
index 52bde168..86e5f60c 100644
--- a/contrib/pdfmark/spdf.tmac
+++ b/contrib/pdfmark/spdf.tmac
@@ -11,17 +11,16 @@ This file is part of groff.
 
 groff is free software; you can redistribute 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.
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 groff 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 groff; see the file COPYING.  If not, write to the Free Software
-Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 
 ..
 .\"
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index d27617e2..62aae6dd 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -5,17 +5,16 @@
 # 
 # groff is free software; you can redistribute 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.
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 # 
 # groff 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 groff; see the file COPYING.  If not, write to the Free Software
-# Foundation, 51 Franklin St - Fifth Floor, Boston, MA 02110-1301, 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/>.
 #
 # Makefile.sub
 #