diff --git a/Include/opcode.h b/Include/opcode.h
index e564bb9d598..2a29e978857 100644
--- a/Include/opcode.h
+++ b/Include/opcode.h
@@ -1,4 +1,4 @@
-/* Auto-generated by Tools/scripts/generate_opcode_h.py */
+/* Auto-generated by Tools/scripts/generate_opcode_h.py from Lib/opcode.py */
 #ifndef Py_OPCODE_H
 #define Py_OPCODE_H
 #ifdef __cplusplus
diff --git a/Tools/scripts/generate_opcode_h.py b/Tools/scripts/generate_opcode_h.py
index 6622a3c8155..b184ffa1709 100644
--- a/Tools/scripts/generate_opcode_h.py
+++ b/Tools/scripts/generate_opcode_h.py
@@ -3,7 +3,8 @@
 import sys
 import tokenize
 
-header = """/* Auto-generated by Tools/scripts/generate_opcode_h.py */
+header = """
+/* Auto-generated by Tools/scripts/generate_opcode_h.py from Lib/opcode.py */
 #ifndef Py_OPCODE_H
 #define Py_OPCODE_H
 #ifdef __cplusplus
@@ -12,7 +13,7 @@
 
 
     /* Instruction opcodes for compiled code */
-"""
+""".lstrip()
 
 footer = """
 /* EXCEPT_HANDLER is a special, implicit block type which is created when