diff --git a/common/build_style/python-module.sh b/common/build_style/python-module.sh
index 1137d24f4a0..2ab6e079b9a 100644
--- a/common/build_style/python-module.sh
+++ b/common/build_style/python-module.sh
@@ -4,12 +4,16 @@
 
 do_build() {
 	: ${python_versions:=2.7}
-	local python_version=
+	local python_version= pysufx="m"
 
 	for python_version in $python_versions; do
 		if [ -n "$CROSS_BUILD" ]; then
 			PYPREFIX="$XBPS_CROSS_BASE"
-			CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${python_version} -I${XBPS_CROSS_BASE}/usr/include"
+			if [ "$python_versions" = "2.7" ]; then
+				CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${python_version} -I${XBPS_CROSS_BASE}/usr/include"
+			else
+				CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${python_version}${pysufx} -I${XBPS_CROSS_BASE}/usr/include"
+			fi
 			LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${python_version} -L${XBPS_CROSS_BASE}/usr/lib"
 			CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
 			LDSHARED="${CC} -shared $LDFLAGS"
@@ -26,14 +30,18 @@ do_build() {
 
 do_install() {
 	: ${python_versions:=2.7}
-	local python_version=
+	local python_version= pysufx="m"
 
 	make_install_args+=" --prefix=/usr --root=$DESTDIR"
 
 	for python_version in $python_versions; do
 		if [ -n "$CROSS_BUILD" ]; then
 			PYPREFIX="$XBPS_CROSS_BASE"
-			CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${python_version} -I${XBPS_CROSS_BASE}/usr/include"
+			if [ "$python_versions" = "2.7" ]; then
+				CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${python_version} -I${XBPS_CROSS_BASE}/usr/include"
+			else
+				CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${python_version}${pysufx} -I${XBPS_CROSS_BASE}/usr/include"
+			fi
 			LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${python_version} -L${XBPS_CROSS_BASE}/usr/lib"
 			CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
 			LDSHARED="${CC} -shared $LDFLAGS"