diff --git a/Lib/symbol.py b/Lib/symbol.py
index 39159b3eb67..38c61931794 100755
--- a/Lib/symbol.py
+++ b/Lib/symbol.py
@@ -76,6 +76,8 @@
 list_iter = 319
 list_for = 320
 list_if = 321
+testlist1 = 322
+encoding_decl = 323
 #--end constants--
 
 sym_name = {}
diff --git a/Lib/token.py b/Lib/token.py
index c77d3430bed..f75412c7a63 100755
--- a/Lib/token.py
+++ b/Lib/token.py
@@ -98,7 +98,7 @@ def main():
     lines = fp.read().split("\n")
     fp.close()
     prog = re.compile(
-        "#define[ \t][ \t]*([A-Z][A-Z_]*)[ \t][ \t]*([0-9][0-9]*)",
+        "#define[ \t][ \t]*([A-Z0-9][A-Z0-9_]*)[ \t][ \t]*([0-9][0-9]*)",
         re.IGNORECASE)
     tokens = {}
     for line in lines: