diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index ebfbd201a2421..af75b0207c4f9 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.36 2014/01/12 09:01:50 wiz Exp $
+# $NetBSD: extension.mk,v 1.37 2014/01/24 12:42:52 obache Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -69,4 +69,7 @@ PY_PEP3147?=	yes
 .if defined(PY_PEP3147) && !empty(PY_PEP3147:M[yY][eE][sS])
 PLIST_AWK+=	-f ${PKGSRCDIR}/lang/python/plist-python.awk
 PLIST_AWK_ENV+=	PYTHON_SOABI="cpython-${_PYTHON_VERSION}"
+PRINT_PLIST_AWK+=	/^[^@]/ && /[^\/]+\.py[co]$$/ {
+PRINT_PLIST_AWK+=	gsub(/__pycache__\//, "")
+PRINT_PLIST_AWK+=	gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
 .endif
diff --git a/mk/plist/print-plist.mk b/mk/plist/print-plist.mk
index 55b0d6bfc41bd..bbc0ae82d842f 100644
--- a/mk/plist/print-plist.mk
+++ b/mk/plist/print-plist.mk
@@ -1,4 +1,4 @@
-# $NetBSD: print-plist.mk,v 1.25 2014/01/18 19:48:57 wiz Exp $
+# $NetBSD: print-plist.mk,v 1.26 2014/01/24 12:42:52 obache Exp $
 
 ###
 ### Automatic PLIST generation
@@ -29,9 +29,6 @@ _PRINT_PLIST_AWK_SUBST+=						\
 	gsub("^${PKGGNUDIR:S/\/$$//}/", "gnu/");			\
 	gsub("^${PKGINFODIR}/", "info/");				\
 	gsub("^${PKGMANDIR}/", "man/");
-# for Python packages
-_PRINT_PLIST_AWK_SUBST+=	gsub(/__pycache__\//, "");
-_PRINT_PLIST_AWK_SUBST+=	gsub(/\.cpython-[0-9]+/, "")
 
 _PRINT_PLIST_AWK_SUBST+=}