diff --git a/lisp/extern/ansi.el b/lisp/extern/ansi.el
index 70eaa7c2..10f62388 100644
--- a/lisp/extern/ansi.el
+++ b/lisp/extern/ansi.el
@@ -24,9 +24,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/extern/package-build/24/package-build-badges.el b/lisp/extern/package-build/24/package-build-badges.el
index 909693cf..425743cd 100644
--- a/lisp/extern/package-build/24/package-build-badges.el
+++ b/lisp/extern/package-build/24/package-build-badges.el
@@ -21,9 +21,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/extern/package-build/24/package-build.el b/lisp/extern/package-build/24/package-build.el
index 84122861..1b031537 100644
--- a/lisp/extern/package-build/24/package-build.el
+++ b/lisp/extern/package-build/24/package-build.el
@@ -25,9 +25,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/extern/package-build/24/package-recipe-mode.el b/lisp/extern/package-build/24/package-recipe-mode.el
index fa5abd7a..6a8167e9 100644
--- a/lisp/extern/package-build/24/package-recipe-mode.el
+++ b/lisp/extern/package-build/24/package-recipe-mode.el
@@ -22,9 +22,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/lisp/extern/package-build/24/package-recipe.el b/lisp/extern/package-build/24/package-recipe.el
index b9fefff1..5f6ec746 100644
--- a/lisp/extern/package-build/24/package-recipe.el
+++ b/lisp/extern/package-build/24/package-recipe.el
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/test/fixtures/home/scripts/setup.ps1 b/test/fixtures/home/scripts/setup.ps1
index 9a0acf7e..f3c271ef 100644
--- a/test/fixtures/home/scripts/setup.ps1
+++ b/test/fixtures/home/scripts/setup.ps1
@@ -11,9 +11,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #
diff --git a/test/fixtures/home/scripts/setup.sh b/test/fixtures/home/scripts/setup.sh
index c6697424..b3e9b69d 100644
--- a/test/fixtures/home/scripts/setup.sh
+++ b/test/fixtures/home/scripts/setup.sh
@@ -13,9 +13,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 ## Commentary:
 #