diff --git a/devel/bzr-upload/Makefile b/devel/bzr-upload/Makefile
index 34c79a47b9b4..805764206212 100644
--- a/devel/bzr-upload/Makefile
+++ b/devel/bzr-upload/Makefile
@@ -20,7 +20,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	bzr_upload
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/bzr-upload/pkg-plist b/devel/bzr-upload/pkg-plist
deleted file mode 100644
index e1d921201c02..000000000000
--- a/devel/bzr-upload/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/cmds.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/cmds.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/cmds.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/info.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/test_auto_upload_hook.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/test_auto_upload_hook.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/test_auto_upload_hook.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/test_upload.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/test_upload.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests/test_upload.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload/tests
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/upload
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib