diff --git a/HISTORY b/HISTORY
index cbc8f226b3..238e263415 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,7 +1,3 @@
-<!--- - Copyright (C) 2017 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 http://mozilla.org/MPL/2.0/. ---> ###
 Functional enhancements from prior major releases of BIND 9
 
 BIND 9.11
diff --git a/HISTORY.md b/HISTORY.md
index 95bd17b823..9cd11b5f38 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,10 +1,10 @@
-<!---
+<!--
  - Copyright (C) 2017  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 http://mozilla.org/MPL/2.0/.
---->
+-->
 ### Functional enhancements from prior major releases of BIND 9
 
 #### BIND 9.11
diff --git a/OPTIONS b/OPTIONS
index aba2516f23..0be74b7aac 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -1,10 +1,6 @@
-<!--- - Copyright (C) 2017 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 http://mozilla.org/MPL/2.0/. ---> Setting the
-STD_CDEFINES environment variable before running configure can be used to
-enable certain compile-time options that are not explicitly defined in
-configure.
+Setting the STD_CDEFINES environment variable before running configure can
+be used to enable certain compile-time options that are not explicitly
+defined in configure.
 
 Some of these settings are:
 
diff --git a/OPTIONS.md b/OPTIONS.md
index f994df8065..db79e69680 100644
--- a/OPTIONS.md
+++ b/OPTIONS.md
@@ -1,10 +1,10 @@
-<!---
+<!--
  - Copyright (C) 2017  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 http://mozilla.org/MPL/2.0/.
---->
+-->
 Setting the `STD_CDEFINES` environment variable before running `configure`
 can be used to enable certain compile-time options that are not explicitly
 defined in `configure`.
diff --git a/README b/README
index dd24073d22..cef8000bb7 100644
--- a/README
+++ b/README
@@ -1,7 +1,4 @@
-<!--- - Copyright (C) 2017 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 http://mozilla.org/MPL/2.0/. ---> # BIND 9
+BIND 9
 
 Contents
 
diff --git a/README.md b/README.md
index b5296ddcff..299908185f 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
-<!---
+<!--
  - Copyright (C) 2017  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 http://mozilla.org/MPL/2.0/.
---->
+-->
 # BIND 9
 
 ### Contents
diff --git a/doc/dev/contrib.md b/doc/dev/contrib.md
index 534ad05fe3..b2aefabb97 100644
--- a/doc/dev/contrib.md
+++ b/doc/dev/contrib.md
@@ -1,10 +1,10 @@
-<!---
+<!--
  - Copyright (C) 2017  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 http://mozilla.org/MPL/2.0/.
---->
+-->
 ## BIND Source Access and Contributor Guidelines
 *Apr 14, 2017*
 
diff --git a/doc/dev/dev.md b/doc/dev/dev.md
index e421ee2fe5..c749512381 100644
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -1,10 +1,10 @@
-<!---
+<!--
  - Copyright (C) 2017  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 http://mozilla.org/MPL/2.0/.
---->
+-->
 ## BIND Developer Information
 
 ### Contents
diff --git a/doc/dev/style.md b/doc/dev/style.md
index fc8310dc2f..a29923d213 100644
--- a/doc/dev/style.md
+++ b/doc/dev/style.md
@@ -1,10 +1,10 @@
-<!---
+<!--
  - Copyright (C) 2017  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 http://mozilla.org/MPL/2.0/.
---->
+-->
 ## BIND 9 Coding Style
 
 BIND 9 is principally written in [C](#cstyle), with some additional code
diff --git a/util/update_copyrights b/util/update_copyrights
index 874e47d8e1..b6c12ca83e 100644
--- a/util/update_copyrights
+++ b/util/update_copyrights
@@ -208,9 +208,9 @@ foreach $file (keys %file_types) {
                 $end_comment = "-->\n";
         } elsif ($type eq "MKD") {
                 $mkd_comment = 1;
-                $start_comment = "<!---\n";
+                $start_comment = "<!--\n";
                 $prefix = " - ";
-                $end_comment = "--->";
+                $end_comment = "-->";
         } elsif ($type eq "TXT") {
                 $prefix = "";
         } else {