diff --git a/converters/py-iconv/Makefile b/converters/py-iconv/Makefile
index 8f42afbbb617..af77107991e7 100644
--- a/converters/py-iconv/Makefile
+++ b/converters/py-iconv/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Iconv wrapper with Unicode codec for Python
 USES=		iconv
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
+PYDISTUTILS_AUTOPLIST=	yes
 
 .if empty(ICONV_LIB)
 SETUPINFO=	,library_dirs=["${LOCALBASE}/lib"],\
@@ -26,9 +26,8 @@ SETUPINFO=	,libraries=["iconv"],library_dirs=["${LOCALBASE}/lib"],\
 		include_dirs=["${LOCALBASE}/include"]
 .endif
 
-NO_STAGE=	yes
 post-patch:
-	cd ${WRKSRC} && ${SED} 's!^\(.*ext_mod.*\)\()]\)$$!\1${SETUPINFO}\2!g'\
-		setup.py > setup.py.tmp && ${CAT} setup.py.tmp > setup.py
+	${REINPLACE_CMD} 's!^\(.*ext_mod.*\)\()]\)$$!\1${SETUPINFO}\2!g'\
+		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/converters/py-iconv/pkg-plist b/converters/py-iconv/pkg-plist
deleted file mode 100644
index ba396cd5b883..000000000000
--- a/converters/py-iconv/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PYTHON_SITELIBDIR%%/iconv.so
-%%PYTHON_SITELIBDIR%%/iconvcodec.py
-%%PYTHON_SITELIBDIR%%/iconvcodec.pyc
-%%PYTHON_SITELIBDIR%%/iconvcodec.pyo