14 files changed, 14 insertions, 28 deletions
diff --git a/scripts/check-copyright-year b/scripts/check-copyright-year
index e72eaeea..dcc04e85 100755
--- a/scripts/check-copyright-year
+++ b/scripts/check-copyright-year
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import print_function
 
diff --git a/scripts/check-silliness b/scripts/check-silliness
index 597eb664..4acc6c3d 100755
--- a/scripts/check-silliness
+++ b/scripts/check-silliness
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 errors=0
 
diff --git a/scripts/clean-artifact-cache b/scripts/clean-artifact-cache
index 2fdd5605..76b32532 100755
--- a/scripts/clean-artifact-cache
+++ b/scripts/clean-artifact-cache
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Remove all chunk artifacts in the cache except the newest. Morph does
 # not currently clean its caches at any point, so this script is necessary
diff --git a/scripts/cmd-filter b/scripts/cmd-filter
index d2f4f784..9ef7fde5 100755
--- a/scripts/cmd-filter
+++ b/scripts/cmd-filter
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Wrapper around morph for use by cmdtest tests. This does several things:
 #
diff --git a/scripts/convert-git-cache b/scripts/convert-git-cache
index 33a8edf1..a387688b 100755
--- a/scripts/convert-git-cache
+++ b/scripts/convert-git-cache
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -eu
 
diff --git a/scripts/edit-morph b/scripts/edit-morph
index 90679b23..25886546 100755
--- a/scripts/edit-morph
+++ b/scripts/edit-morph
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import cliapp
diff --git a/scripts/fix-committer-info b/scripts/fix-committer-info
index 0bd85274..6073862e 100644
--- a/scripts/fix-committer-info
+++ b/scripts/fix-committer-info
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Fix git committer info. By hardcoding all of this info we make sure that
 # all of the commits we make during testing have reproducible commit SHA1s.
diff --git a/scripts/list-tree b/scripts/list-tree
index a1e2e8cb..08dac75e 100755
--- a/scripts/list-tree
+++ b/scripts/list-tree
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # List contents of a directory tree in a reproducible manner: only include
 # details that we care about, and that won't be changing between test runs
diff --git a/scripts/python-check b/scripts/python-check
index ce3419d5..06e5d60d 100644
--- a/scripts/python-check
+++ b/scripts/python-check
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # When sourced by scripts, if the python version is too old
 # fake the output and exit.
diff --git a/scripts/review-gitmodules b/scripts/review-gitmodules
index 89574833..29dca57e 100755
--- a/scripts/review-gitmodules
+++ b/scripts/review-gitmodules
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Check every system morphology in a checked out system branch by editing
 # every chunk and recursively checking gitmodules.
diff --git a/scripts/run-git-in b/scripts/run-git-in
index 80b87d1a..e091108b 100755
--- a/scripts/run-git-in
+++ b/scripts/run-git-in
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Run git in a given directory.
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata
index fc263f96..7961ea9d 100644
--- a/scripts/setup-3rd-party-strata
+++ b/scripts/setup-3rd-party-strata
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Create strata outside the main morphologies repository, which is useful
diff --git a/scripts/test-morph b/scripts/test-morph
index d8480d92..ce9b4909 100755
--- a/scripts/test-morph
+++ b/scripts/test-morph
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Wrapper around morph for use by cmdtest tests. This does several things:
 #
diff --git a/scripts/yaml-extract b/scripts/yaml-extract
index 6f55e62f..b87329b4 100755
--- a/scripts/yaml-extract
+++ b/scripts/yaml-extract
@@ -40,8 +40,7 @@
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 import sys