diff --git a/devel/buildbot-slave/Makefile b/devel/buildbot-slave/Makefile
index cf771770ce62..67e3af362179 100644
--- a/devel/buildbot-slave/Makefile
+++ b/devel/buildbot-slave/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	buildbot-slave
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3
 CATEGORIES=	devel python
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	buildbot/buildbot/${PORTVERSION}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Slave part of Buildbot, an continuous integration system
 
+PROJECTHOST=	buildbot
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 USE_TWISTED_RUN=	runner
diff --git a/devel/buildbot-slave/distinfo b/devel/buildbot-slave/distinfo
index 5e7817c5708d..65eee0940010 100644
--- a/devel/buildbot-slave/distinfo
+++ b/devel/buildbot-slave/distinfo
@@ -1,2 +1,2 @@
-SHA256 (buildbot-slave-0.8.2.tar.gz) = 7bdecb962f2bd877e1b06bc33628949e1540010634eacfc378f68f0db407fb07
-SIZE (buildbot-slave-0.8.2.tar.gz) = 79997
+SHA256 (buildbot-slave-0.8.3.tar.gz) = e0d83c5894495b82c0b702480653ea712e5288f644a0f0661099e66ba64ed56c
+SIZE (buildbot-slave-0.8.3.tar.gz) = 86438
diff --git a/devel/buildbot-slave/files/patch-setup.py b/devel/buildbot-slave/files/patch-setup.py
index 9927c59c30ba..fbf6347a43dd 100644
--- a/devel/buildbot-slave/files/patch-setup.py
+++ b/devel/buildbot-slave/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2010-08-09 10:54:05.000000000 +0800
-+++ setup.py	2010-08-09 11:06:44.000000000 +0800
-@@ -58,22 +58,4 @@
+--- setup.py.orig	2011-02-10 18:18:31.000000000 +0100
++++ setup.py	2011-02-10 18:18:42.000000000 +0100
+@@ -102,18 +102,4 @@
  if sys.platform == "win32":
      setup_args['zip_safe'] = False
  
@@ -9,17 +9,13 @@
 -    # to the setup args.
 -    import setuptools #@UnusedImport
 -except ImportError:
--    setup_args['scripts'] = [
--        'bin/buildslave'
--    ]
+-    pass
 -else:
 -    setup_args['install_requires'] = [
 -        'twisted >= 2.0.0',
 -    ]
--    setup_args['entry_points'] = {
--        'console_scripts': [
--            'buildslave = buildslave.scripts.runner:run',
--        ],
--    }
+-
+-    if os.getenv('NO_INSTALL_REQS'):
+-        setup_args['install_requires'] = None
 -
  setup(**setup_args)
diff --git a/devel/buildbot-slave/pkg-plist b/devel/buildbot-slave/pkg-plist
index 612ecc04e7b1..0bfdd3f6b709 100644
--- a/devel/buildbot-slave/pkg-plist
+++ b/devel/buildbot-slave/pkg-plist
@@ -25,6 +25,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/buildslave/commands/darcs.py
 %%PYTHON_SITELIBDIR%%/buildslave/commands/darcs.pyc
 %%PYTHON_SITELIBDIR%%/buildslave/commands/darcs.pyo
+%%PYTHON_SITELIBDIR%%/buildslave/commands/fs.py
+%%PYTHON_SITELIBDIR%%/buildslave/commands/fs.pyc
+%%PYTHON_SITELIBDIR%%/buildslave/commands/fs.pyo
 %%PYTHON_SITELIBDIR%%/buildslave/commands/git.py
 %%PYTHON_SITELIBDIR%%/buildslave/commands/git.pyc
 %%PYTHON_SITELIBDIR%%/buildslave/commands/git.pyo
@@ -37,6 +40,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/buildslave/commands/registry.py
 %%PYTHON_SITELIBDIR%%/buildslave/commands/registry.pyc
 %%PYTHON_SITELIBDIR%%/buildslave/commands/registry.pyo
+%%PYTHON_SITELIBDIR%%/buildslave/commands/repo.py
+%%PYTHON_SITELIBDIR%%/buildslave/commands/repo.pyc
+%%PYTHON_SITELIBDIR%%/buildslave/commands/repo.pyo
 %%PYTHON_SITELIBDIR%%/buildslave/commands/shell.py
 %%PYTHON_SITELIBDIR%%/buildslave/commands/shell.pyc
 %%PYTHON_SITELIBDIR%%/buildslave/commands/shell.pyo
@@ -112,6 +118,9 @@ bin/buildslave
 %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_darcs.py
 %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_darcs.pyc
 %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_darcs.pyo
+%%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_fs.py
+%%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_fs.pyc
+%%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_fs.pyo
 %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_git.py
 %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_git.pyc
 %%PYTHON_SITELIBDIR%%/buildslave/test/unit/test_commands_git.pyo