diff --git a/Misc/NEWS b/Misc/NEWS
index f2a8594ea7b..7aa596feab9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -65,8 +65,11 @@ Documentation
 Tools/Demos
 -----------
 
+- Issue #23330: h2py now supports arbitrary filenames in #include.
+
 - Issue #24031: make patchcheck now supports git checkouts, too.
 
+
 What's New in Python 3.5.0 alpha 4?
 ===================================
 
diff --git a/Tools/scripts/h2py.py b/Tools/scripts/h2py.py
index 4f871d90107..0967fc29d60 100755
--- a/Tools/scripts/h2py.py
+++ b/Tools/scripts/h2py.py
@@ -29,7 +29,7 @@ p_macro = re.compile(
   '^[\t ]*#[\t ]*define[\t ]+'
   '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
 
-p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
+p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([^>\n]+)>')
 
 p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?')
 p_cpp_comment = re.compile('//.*')