diff --git a/devel/py-buildbot-slave/DESCR b/devel/py-buildbot-slave/DESCR
new file mode 100644
index 000000000000..307525b7c817
--- /dev/null
+++ b/devel/py-buildbot-slave/DESCR
@@ -0,0 +1,3 @@
+The BuildBot is a system to automate the compile/test cycle required by
+most software projects to validate code changes. This package contains
+the buildslave.
diff --git a/devel/py-buildbot-slave/Makefile b/devel/py-buildbot-slave/Makefile
new file mode 100644
index 000000000000..4155e8676263
--- /dev/null
+++ b/devel/py-buildbot-slave/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/11/13 23:07:05 joerg Exp $
+#
+
+DISTNAME=		buildbot-slave-0.8.5
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
+EGG_NAME=		buildbot_slave-0.8.5
+CATEGORIES=		devel net python
+MASTER_SITES=		http://buildbot.googlecode.com/files/
+
+MAINTAINER=		joerg@NetBSD.org
+HOMEPAGE=		http://buildbot.net/
+COMMENT=		Buildbot slave
+LICENSE=		gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+PYTHON_VERSIONS_ACCEPTED=		27 26
+
+DEPENDS+=	${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-buildbot-slave/PLIST b/devel/py-buildbot-slave/PLIST
new file mode 100644
index 000000000000..7a53b72d93bb
--- /dev/null
+++ b/devel/py-buildbot-slave/PLIST
@@ -0,0 +1,197 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/11/13 23:07:05 joerg Exp $
+bin/buildslave
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/buildslave/VERSION
+${PYSITELIB}/buildslave/__init__.py
+${PYSITELIB}/buildslave/__init__.pyc
+${PYSITELIB}/buildslave/__init__.pyo
+${PYSITELIB}/buildslave/bot.py
+${PYSITELIB}/buildslave/bot.pyc
+${PYSITELIB}/buildslave/bot.pyo
+${PYSITELIB}/buildslave/commands/__init__.py
+${PYSITELIB}/buildslave/commands/__init__.pyc
+${PYSITELIB}/buildslave/commands/__init__.pyo
+${PYSITELIB}/buildslave/commands/base.py
+${PYSITELIB}/buildslave/commands/base.pyc
+${PYSITELIB}/buildslave/commands/base.pyo
+${PYSITELIB}/buildslave/commands/bk.py
+${PYSITELIB}/buildslave/commands/bk.pyc
+${PYSITELIB}/buildslave/commands/bk.pyo
+${PYSITELIB}/buildslave/commands/bzr.py
+${PYSITELIB}/buildslave/commands/bzr.pyc
+${PYSITELIB}/buildslave/commands/bzr.pyo
+${PYSITELIB}/buildslave/commands/cvs.py
+${PYSITELIB}/buildslave/commands/cvs.pyc
+${PYSITELIB}/buildslave/commands/cvs.pyo
+${PYSITELIB}/buildslave/commands/darcs.py
+${PYSITELIB}/buildslave/commands/darcs.pyc
+${PYSITELIB}/buildslave/commands/darcs.pyo
+${PYSITELIB}/buildslave/commands/fs.py
+${PYSITELIB}/buildslave/commands/fs.pyc
+${PYSITELIB}/buildslave/commands/fs.pyo
+${PYSITELIB}/buildslave/commands/git.py
+${PYSITELIB}/buildslave/commands/git.pyc
+${PYSITELIB}/buildslave/commands/git.pyo
+${PYSITELIB}/buildslave/commands/hg.py
+${PYSITELIB}/buildslave/commands/hg.pyc
+${PYSITELIB}/buildslave/commands/hg.pyo
+${PYSITELIB}/buildslave/commands/mtn.py
+${PYSITELIB}/buildslave/commands/mtn.pyc
+${PYSITELIB}/buildslave/commands/mtn.pyo
+${PYSITELIB}/buildslave/commands/p4.py
+${PYSITELIB}/buildslave/commands/p4.pyc
+${PYSITELIB}/buildslave/commands/p4.pyo
+${PYSITELIB}/buildslave/commands/registry.py
+${PYSITELIB}/buildslave/commands/registry.pyc
+${PYSITELIB}/buildslave/commands/registry.pyo
+${PYSITELIB}/buildslave/commands/repo.py
+${PYSITELIB}/buildslave/commands/repo.pyc
+${PYSITELIB}/buildslave/commands/repo.pyo
+${PYSITELIB}/buildslave/commands/shell.py
+${PYSITELIB}/buildslave/commands/shell.pyc
+${PYSITELIB}/buildslave/commands/shell.pyo
+${PYSITELIB}/buildslave/commands/svn.py
+${PYSITELIB}/buildslave/commands/svn.pyc
+${PYSITELIB}/buildslave/commands/svn.pyo
+${PYSITELIB}/buildslave/commands/transfer.py
+${PYSITELIB}/buildslave/commands/transfer.pyc
+${PYSITELIB}/buildslave/commands/transfer.pyo
+${PYSITELIB}/buildslave/commands/utils.py
+${PYSITELIB}/buildslave/commands/utils.pyc
+${PYSITELIB}/buildslave/commands/utils.pyo
+${PYSITELIB}/buildslave/exceptions.py
+${PYSITELIB}/buildslave/exceptions.pyc
+${PYSITELIB}/buildslave/exceptions.pyo
+${PYSITELIB}/buildslave/interfaces.py
+${PYSITELIB}/buildslave/interfaces.pyc
+${PYSITELIB}/buildslave/interfaces.pyo
+${PYSITELIB}/buildslave/monkeypatches/__init__.py
+${PYSITELIB}/buildslave/monkeypatches/__init__.pyc
+${PYSITELIB}/buildslave/monkeypatches/__init__.pyo
+${PYSITELIB}/buildslave/monkeypatches/bug4881.py
+${PYSITELIB}/buildslave/monkeypatches/bug4881.pyc
+${PYSITELIB}/buildslave/monkeypatches/bug4881.pyo
+${PYSITELIB}/buildslave/monkeypatches/bug5079.py
+${PYSITELIB}/buildslave/monkeypatches/bug5079.pyc
+${PYSITELIB}/buildslave/monkeypatches/bug5079.pyo
+${PYSITELIB}/buildslave/pbutil.py
+${PYSITELIB}/buildslave/pbutil.pyc
+${PYSITELIB}/buildslave/pbutil.pyo
+${PYSITELIB}/buildslave/runprocess.py
+${PYSITELIB}/buildslave/runprocess.pyc
+${PYSITELIB}/buildslave/runprocess.pyo
+${PYSITELIB}/buildslave/scripts/__init__.py
+${PYSITELIB}/buildslave/scripts/__init__.pyc
+${PYSITELIB}/buildslave/scripts/__init__.pyo
+${PYSITELIB}/buildslave/scripts/logwatcher.py
+${PYSITELIB}/buildslave/scripts/logwatcher.pyc
+${PYSITELIB}/buildslave/scripts/logwatcher.pyo
+${PYSITELIB}/buildslave/scripts/runner.py
+${PYSITELIB}/buildslave/scripts/runner.pyc
+${PYSITELIB}/buildslave/scripts/runner.pyo
+${PYSITELIB}/buildslave/scripts/startup.py
+${PYSITELIB}/buildslave/scripts/startup.pyc
+${PYSITELIB}/buildslave/scripts/startup.pyo
+${PYSITELIB}/buildslave/test/__init__.py
+${PYSITELIB}/buildslave/test/__init__.pyc
+${PYSITELIB}/buildslave/test/__init__.pyo
+${PYSITELIB}/buildslave/test/fake/__init__.py
+${PYSITELIB}/buildslave/test/fake/__init__.pyc
+${PYSITELIB}/buildslave/test/fake/__init__.pyo
+${PYSITELIB}/buildslave/test/fake/remote.py
+${PYSITELIB}/buildslave/test/fake/remote.pyc
+${PYSITELIB}/buildslave/test/fake/remote.pyo
+${PYSITELIB}/buildslave/test/fake/runprocess.py
+${PYSITELIB}/buildslave/test/fake/runprocess.pyc
+${PYSITELIB}/buildslave/test/fake/runprocess.pyo
+${PYSITELIB}/buildslave/test/fake/slavebuilder.py
+${PYSITELIB}/buildslave/test/fake/slavebuilder.pyc
+${PYSITELIB}/buildslave/test/fake/slavebuilder.pyo
+${PYSITELIB}/buildslave/test/test_extra_coverage.py
+${PYSITELIB}/buildslave/test/test_extra_coverage.pyc
+${PYSITELIB}/buildslave/test/test_extra_coverage.pyo
+${PYSITELIB}/buildslave/test/unit/__init__.py
+${PYSITELIB}/buildslave/test/unit/__init__.pyc
+${PYSITELIB}/buildslave/test/unit/__init__.pyo
+${PYSITELIB}/buildslave/test/unit/runprocess-scripts.py
+${PYSITELIB}/buildslave/test/unit/runprocess-scripts.pyc
+${PYSITELIB}/buildslave/test/unit/runprocess-scripts.pyo
+${PYSITELIB}/buildslave/test/unit/test_bot.py
+${PYSITELIB}/buildslave/test/unit/test_bot.pyc
+${PYSITELIB}/buildslave/test/unit/test_bot.pyo
+${PYSITELIB}/buildslave/test/unit/test_bot_BuildSlave.py
+${PYSITELIB}/buildslave/test/unit/test_bot_BuildSlave.pyc
+${PYSITELIB}/buildslave/test/unit/test_bot_BuildSlave.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_base.py
+${PYSITELIB}/buildslave/test/unit/test_commands_base.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_base.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_bk.py
+${PYSITELIB}/buildslave/test/unit/test_commands_bk.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_bk.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_bzr.py
+${PYSITELIB}/buildslave/test/unit/test_commands_bzr.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_bzr.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_cvs.py
+${PYSITELIB}/buildslave/test/unit/test_commands_cvs.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_cvs.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_darcs.py
+${PYSITELIB}/buildslave/test/unit/test_commands_darcs.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_darcs.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_fs.py
+${PYSITELIB}/buildslave/test/unit/test_commands_fs.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_fs.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_git.py
+${PYSITELIB}/buildslave/test/unit/test_commands_git.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_git.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_hg.py
+${PYSITELIB}/buildslave/test/unit/test_commands_hg.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_hg.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_mtn.py
+${PYSITELIB}/buildslave/test/unit/test_commands_mtn.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_mtn.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_p4.py
+${PYSITELIB}/buildslave/test/unit/test_commands_p4.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_p4.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_registry.py
+${PYSITELIB}/buildslave/test/unit/test_commands_registry.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_registry.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_shell.py
+${PYSITELIB}/buildslave/test/unit/test_commands_shell.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_shell.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_svn.py
+${PYSITELIB}/buildslave/test/unit/test_commands_svn.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_svn.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_transfer.py
+${PYSITELIB}/buildslave/test/unit/test_commands_transfer.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_transfer.pyo
+${PYSITELIB}/buildslave/test/unit/test_commands_utils.py
+${PYSITELIB}/buildslave/test/unit/test_commands_utils.pyc
+${PYSITELIB}/buildslave/test/unit/test_commands_utils.pyo
+${PYSITELIB}/buildslave/test/unit/test_runprocess.py
+${PYSITELIB}/buildslave/test/unit/test_runprocess.pyc
+${PYSITELIB}/buildslave/test/unit/test_runprocess.pyo
+${PYSITELIB}/buildslave/test/unit/test_util.py
+${PYSITELIB}/buildslave/test/unit/test_util.pyc
+${PYSITELIB}/buildslave/test/unit/test_util.pyo
+${PYSITELIB}/buildslave/test/util/__init__.py
+${PYSITELIB}/buildslave/test/util/__init__.pyc
+${PYSITELIB}/buildslave/test/util/__init__.pyo
+${PYSITELIB}/buildslave/test/util/command.py
+${PYSITELIB}/buildslave/test/util/command.pyc
+${PYSITELIB}/buildslave/test/util/command.pyo
+${PYSITELIB}/buildslave/test/util/compat.py
+${PYSITELIB}/buildslave/test/util/compat.pyc
+${PYSITELIB}/buildslave/test/util/compat.pyo
+${PYSITELIB}/buildslave/test/util/misc.py
+${PYSITELIB}/buildslave/test/util/misc.pyc
+${PYSITELIB}/buildslave/test/util/misc.pyo
+${PYSITELIB}/buildslave/test/util/sourcecommand.py
+${PYSITELIB}/buildslave/test/util/sourcecommand.pyc
+${PYSITELIB}/buildslave/test/util/sourcecommand.pyo
+${PYSITELIB}/buildslave/util.py
+${PYSITELIB}/buildslave/util.pyc
+${PYSITELIB}/buildslave/util.pyo
diff --git a/devel/py-buildbot-slave/distinfo b/devel/py-buildbot-slave/distinfo
new file mode 100644
index 000000000000..c40ffd4c15c9
--- /dev/null
+++ b/devel/py-buildbot-slave/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/11/13 23:07:05 joerg Exp $
+
+SHA1 (buildbot-slave-0.8.5.tar.gz) = b30189a5a9e773f430c2794dd73bdc74388a1627
+RMD160 (buildbot-slave-0.8.5.tar.gz) = f3247de750772c6e0c1137063388dd96efa1542e
+Size (buildbot-slave-0.8.5.tar.gz) = 98133 bytes