diff --git a/devel/bzr-scmproj/Makefile b/devel/bzr-scmproj/Makefile
index a15cfc4348f2..fc03d3dc3348 100644
--- a/devel/bzr-scmproj/Makefile
+++ b/devel/bzr-scmproj/Makefile
@@ -18,6 +18,6 @@ RUN_DEPENDS=	bzr:${PORTSDIR}/devel/bzr
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/devel/bzr-scmproj/pkg-plist b/devel/bzr-scmproj/pkg-plist
deleted file mode 100644
index 496b74cb3dd5..000000000000
--- a/devel/bzr-scmproj/pkg-plist
+++ /dev/null
@@ -1,79 +0,0 @@
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/AUTHORS.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/COPYING.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/INSTALL.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/NEWS.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/action.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/action.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/action.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/cli.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/cli.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/cli.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/howto.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/index.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/roadmap.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/rst2html.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/rst2html.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/rst2html.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/summary.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/tips-n-tricks.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/v1-devel.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/v1-project-cfg.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/v1-templates.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/v1-workspace.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/v2-devel.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/v2-migration.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/vs-config-manager.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs/vs-nested-trees.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/project.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/project.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/project.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/BSD-LICENSE.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/odict.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/odict.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/odict.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils/odict.txt
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_action.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_action.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_action.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_cli.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_cli.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_cli.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_project.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_project.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_project.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_snapshot.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_snapshot.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_snapshot.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_template.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_template.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_template.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_vcs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_vcs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/test_vcs.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/whiteutils.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/whiteutils.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests/whiteutils.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/vcs.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/vcs.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/vcs.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/tests
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/pythonutils
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj/docs
-@dirrm %%PYTHON_SITELIBDIR%%/bzrlib/plugins/scmproj
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib/plugins
-@dirrmtry %%PYTHON_SITELIBDIR%%/bzrlib