diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dfccdbf50..6412ea52ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -455,9 +455,11 @@ misc:
     - sh util/tabify-changes < CHANGES > CHANGES.tmp
     - diff -urNap CHANGES CHANGES.tmp
     - perl util/check-changes CHANGES
+    - sh util/check-line-length.sh CHANGES
     - test ! -f CHANGES.SE || sh util/tabify-changes < CHANGES.SE > CHANGES.tmp
     - test ! -f CHANGES.SE || diff -urNap CHANGES.SE CHANGES.tmp
     - test ! -f CHANGES.SE || perl util/check-changes master=0 CHANGES.SE
+    - test ! -f CHANGES.SE || sh util/check-line-length.sh CHANGES.SE
     - rm CHANGES.tmp
     - perl -w util/merge_copyrights
     - diff -urNap util/copyrights util/newcopyrights
diff --git a/CHANGES b/CHANGES
index 2f221ce003..e8770530e3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,7 @@
 			named failed to start. [GL #2413]
 
 5570.	[bug]		Improve the performance of dnssec-verify by reducing
-			the number of repeated calls to dns_dnssec_keyfromrdata().
+			the number of repeated calls to dns_dnssec_keyfromrdata.
 			[GL #2073]
 
 5569.	[bug]		Emit useful error message when 'rndc retransfer' is
@@ -18,8 +18,8 @@
 
 5566.	[func]		Add "stale-answer-client-timeout" option, which
 			is the amount of time a recursive resolver waits before
-			attempting to answer the query using stale data from cache.
-			[GL #2247]
+			attempting to answer the query using stale data from
+			cache. [GL #2247]
 
 5565.	[func]		The SONAMEs for BIND 9 libraries now include the current
 			BIND 9 version number, in an effort to tightly couple
diff --git a/util/check-line-length.sh b/util/check-line-length.sh
new file mode 100644
index 0000000000..3114dba8dd
--- /dev/null
+++ b/util/check-line-length.sh
@@ -0,0 +1,22 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+expand "$1" |
+awk -v file="$1" 'length > 80 {
+    if (logged == 0) {
+        print file ": Line Too Long"
+        logged = 1
+    }
+    print
+}
+END {
+    if (logged == 1) {
+        exit(1)
+    }
+}'
diff --git a/util/copyrights b/util/copyrights
index f69380df2c..7270dccc78 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -2189,6 +2189,7 @@
 ./util/check-cocci				X	2018,2019,2020,2021
 ./util/check-includes.pl			PERL	2000,2001,2004,2007,2012,2016,2017,2018,2019,2020,2021
 ./util/check-instincludes.sh			SH	2000,2001,2004,2007,2012,2016,2018,2019,2020,2021
+./util/check-line-length.sh			SH	2021
 ./util/check-make-install.in			SH	2020
 ./util/check-pullups.pl				PERL	2001,2002,2003,2004,2007,2012,2016,2018,2019,2020,2021
 ./util/check-sources.pl				PERL	2000,2001,2004,2007,2012,2013,2016,2018,2019,2020,2021