diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp
index 6803a80..f43f7e7 100644
--- a/redfish-core/include/registries/base_message_registry.hpp
+++ b/redfish-core/include/registries/base_message_registry.hpp
@@ -1,7 +1,12 @@
-
 /****************************************************************
+ *                 READ THIS WARNING FIRST
  * This is an auto-generated header which contains definitions
  * for Redfish DMTF defined messages.
+ * DO NOT modify this registry outside of running the
+ * parse_regisries.py script.  The definitions contained within
+ * this file are owned by DMTF.  Any modifications to these files
+ * should be first pushed to the relevant registry in the DMTF
+ * github organization.
  ***************************************************************/
 #pragma once
 #include <registries.hpp>
diff --git a/redfish-core/include/registries/privilege_registry.hpp b/redfish-core/include/registries/privilege_registry.hpp
index d2f8fd8..bd0a501 100644
--- a/redfish-core/include/registries/privilege_registry.hpp
+++ b/redfish-core/include/registries/privilege_registry.hpp
@@ -1,5 +1,14 @@
 #pragma once
-// privilege_registry.hpp is generated.  Do not edit directly
+/****************************************************************
+ *                 READ THIS WARNING FIRST
+ * This is an auto-generated header which contains definitions
+ * for Redfish DMTF defined messages.
+ * DO NOT modify this registry outside of running the
+ * parse_regisries.py script.  The definitions contained within
+ * this file are owned by DMTF.  Any modifications to these files
+ * should be first pushed to the relevant registry in the DMTF
+ * github organization.
+ ***************************************************************/
 // clang-format off
 
 #include <privileges.hpp>
diff --git a/redfish-core/include/registries/resource_event_message_registry.hpp b/redfish-core/include/registries/resource_event_message_registry.hpp
index 4566003..f769c77 100644
--- a/redfish-core/include/registries/resource_event_message_registry.hpp
+++ b/redfish-core/include/registries/resource_event_message_registry.hpp
@@ -1,7 +1,12 @@
-
 /****************************************************************
+ *                 READ THIS WARNING FIRST
  * This is an auto-generated header which contains definitions
  * for Redfish DMTF defined messages.
+ * DO NOT modify this registry outside of running the
+ * parse_regisries.py script.  The definitions contained within
+ * this file are owned by DMTF.  Any modifications to these files
+ * should be first pushed to the relevant registry in the DMTF
+ * github organization.
  ***************************************************************/
 #pragma once
 #include <registries.hpp>
diff --git a/redfish-core/include/registries/task_event_message_registry.hpp b/redfish-core/include/registries/task_event_message_registry.hpp
index d99d7ce..8f6ec43 100644
--- a/redfish-core/include/registries/task_event_message_registry.hpp
+++ b/redfish-core/include/registries/task_event_message_registry.hpp
@@ -1,7 +1,12 @@
-
 /****************************************************************
+ *                 READ THIS WARNING FIRST
  * This is an auto-generated header which contains definitions
  * for Redfish DMTF defined messages.
+ * DO NOT modify this registry outside of running the
+ * parse_regisries.py script.  The definitions contained within
+ * this file are owned by DMTF.  Any modifications to these files
+ * should be first pushed to the relevant registry in the DMTF
+ * github organization.
  ***************************************************************/
 #pragma once
 #include <registries.hpp>
diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 4973633..604276a 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -13,11 +13,18 @@
 
 import xml.etree.ElementTree as ET
 
-REGISTRY_HEADER = '''
-/****************************************************************
+WARNING = '''/****************************************************************
+ *                 READ THIS WARNING FIRST
  * This is an auto-generated header which contains definitions
  * for Redfish DMTF defined messages.
- ***************************************************************/
+ * DO NOT modify this registry outside of running the
+ * parse_regisries.py script.  The definitions contained within
+ * this file are owned by DMTF.  Any modifications to these files
+ * should be first pushed to the relevant registry in the DMTF
+ * github organization.
+ ***************************************************************/'''
+
+REGISTRY_HEADER = WARNING + '''
 #pragma once
 #include <registries.hpp>
 
@@ -161,11 +168,9 @@
                     'privilege_registry.hpp', 'privilege')
     with open(path, 'w') as registry:
         registry.write("#pragma once\n")
-        registry.write(
-            "// {} is generated.  Do not edit directly\n".format(
-                os.path.basename(path)))
+        registry.write(WARNING)
 
-        registry.write("// clang-format off\n")
+        registry.write("\n// clang-format off\n")
         registry.write("\n#include <privileges.hpp>\n\n")
         registry.write("namespace redfish::privileges\n")
         registry.write("{\n")