diff --git a/ChangeLog b/ChangeLog
index 143a5408..0bec235d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@ NEW IN WAF 1.7.10
 * Codelite plugin by Christian Klein
 * Validate the versioned library number #1180
 * New export_defines keyword for C/C++/Fortran libraries
-* Python config tests enhancements #1231
+* Python config tests enhancements #1231 #1261
 
 NEW IN WAF 1.7.9
 ----------------
diff --git a/waflib/Tools/python.py b/waflib/Tools/python.py
index 19909811..f31ba757 100644
--- a/waflib/Tools/python.py
+++ b/waflib/Tools/python.py
@@ -269,7 +269,7 @@ def check_python_headers(conf):
 	#name = 'python' + env['PYTHON_VERSION']
 
 	# TODO simplify this
-	for name in ('python' + env['PYTHON_VERSION'], 'python' + env['PYTHON_VERSION'].replace('.', '')):
+	for name in ('python' + env['PYTHON_VERSION'], 'python' + env['PYTHON_VERSION'] + 'm', 'python' + env['PYTHON_VERSION'].replace('.', '')):
 
 		# LIBPATH_PYEMBED is already set; see if it works.
 		if not result and env['LIBPATH_PYEMBED']: