--- a/setup-slave.py
+++ b/setup-slave.py
@@ -10,40 +10,46 @@
 # you should have received as part of this distribution. The terms
 # are also available at http://bitten.edgewall.org/wiki/License.
 
-from setuptools import setup
+from setuptools import setup as setup_slave
 from setuptools.command import egg_info
 
-NS = 'http://bitten.cmlenz.net/tools/'
+from setup import recipe_commands, shared_args
 
 # TODO: there must be a way to pass this altered value in...
 egg_info.manifest_maker.template = "MANIFEST-SLAVE.in"
 
-setup(
-    name = 'Bitten-Slave',
-    version = '0.6',
-    description = 'Continuous integration build slave for Trac',
-    long_description = \
-"""A slave for running builds and submitting them to Bitten, the continuous integration system for Trac""",
-    author = 'Edgewall Software',
-    author_email = 'info@edgewall.org',
-    license = 'BSD',
-    url = 'http://bitten.edgewall.org/',
-    download_url = 'http://bitten.edgewall.org/wiki/Download',
-    zip_safe = False,
+if __name__ == '__main__':
+    setup_slave(
+        name = 'Bitten-Slave',
+        description = 'Continuous integration build slave for Trac',
+        long_description = \
+    """A slave for running builds and submitting them to Bitten, the continuous integration system for Trac""",
 
-    py_modules = ["bitten.__init__", "bitten.slave",
-                 "bitten.build.__init__", "bitten.build.api", "bitten.build.config",
-                 "bitten.recipe", "bitten.tests.slave",
-                 "bitten.util.__init__", "bitten.util.testrunner", "bitten.util.xmlio",
-                ],
-    test_suite = 'bitten.tests.slave',
-    entry_points = {
-        'console_scripts': [
-            'bitten-slave = bitten.slave:main'
-        ],
-        'distutils.commands': [
-            'unittest = bitten.util.testrunner:unittest'
-        ],
-    },
-)
-
+        py_modules = ["bitten.__init__",
+                      "bitten.build.__init__",
+                      "bitten.build.api",
+                      "bitten.build.config",
+                      "bitten.build.ctools",
+                      "bitten.build.hgtools",
+                      "bitten.build.javatools",
+                      "bitten.build.monotools",
+                      "bitten.build.phptools",
+                      "bitten.build.pythontools",
+                      "bitten.build.shtools",
+                      "bitten.build.svntools",
+                      "bitten.build.xmltools",
+                      "bitten.recipe",
+                      "bitten.slave",
+                      "bitten.util.__init__",
+                      "bitten.util.testrunner",
+                      "bitten.util.xmlio",
+                    ],
+        entry_points = {
+            'console_scripts': [
+                'bitten-slave = bitten.slave:main'
+            ],
+            'bitten.recipe_commands': recipe_commands
+        },
+        
+        **shared_args
+    )