Index: Mk/Uses/python.mk
===================================================================
--- Mk/Uses/python.mk	(revision 558950)
+++ Mk/Uses/python.mk	(working copy)
@@ -442,6 +442,13 @@
 PYTHON_REL=		# empty
 PYTHON_ABIVER=		# empty
 PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
+
+.if ${PYTHON_VER} == 3.8
+PYTHON_EXT_SUFFIX=	cpython-${PYTHON_SUFFIX}.so
+.else
+PYTHON_EXT_SUFFIX=	so
+.endif
+
 # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
 .if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
 .include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
@@ -698,6 +705,7 @@
 		PYTHON_PLATFORM=${PYTHON_PLATFORM} \
 		PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
+		PYTHON_EXT_SUFFIX=${PYTHON_EXT_SUFFIX} \
 		PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 .if ${PYTHON_REL} < 3000
Index: devel/gobject-introspection/pkg-plist
===================================================================
--- devel/gobject-introspection/pkg-plist	(revision 558950)
+++ devel/gobject-introspection/pkg-plist	(working copy)
@@ -102,7 +102,7 @@
 lib/gobject-introspection/giscanner/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 lib/gobject-introspection/giscanner/__pycache__/xmlwriter.cpython-%%PYTHON_SUFFIX%%.pyc
-lib/gobject-introspection/giscanner/_giscanner.so
+lib/gobject-introspection/giscanner/_giscanner.%%PYTHON_EXT_SUFFIX%%
 lib/gobject-introspection/giscanner/_version.py
 lib/gobject-introspection/giscanner/annotationmain.py
 lib/gobject-introspection/giscanner/annotationparser.py
Index: devel/py-grpcio/Makefile
===================================================================
--- devel/py-grpcio/Makefile	(revision 558950)
+++ devel/py-grpcio/Makefile	(working copy)
@@ -27,7 +27,7 @@
 LDFLAGS+=	-lcares
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so
-	${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR}/\(.*\)/grpcio/grpc/_cython/cygrpc.so|${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.so|g' ${_PYTHONPKGLIST}
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc*.so
+	${REINPLACE_CMD} -e 's|${PYTHONPREFIX_SITELIBDIR}/\(.*\)/grpcio/grpc/_cython/cygrpc.${PYTHON_EXT_SUFFIX}|${PYTHONPREFIX_SITELIBDIR}/grpc/_cython/cygrpc.${PYTHON_EXT_SUFFIX}|g' ${_PYTHONPKGLIST}
 
 .include <bsd.port.mk>