diff --git a/buildbot_slave/.gitignore b/buildbot_slave/.gitignore
new file mode 100644
index 0000000..8b30619
--- /dev/null
+++ b/buildbot_slave/.gitignore
@@ -0,0 +1 @@
+local_config.sh
diff --git a/buildbot_slave/coxlab_config.sh b/buildbot_slave/coxlab_config.sh
new file mode 100644
index 0000000..e65d09d
--- /dev/null
+++ b/buildbot_slave/coxlab_config.sh
@@ -0,0 +1,2 @@
+ADMIN_INFO="Dave <cox@rowland.harvard.edu>"
+MACHINE_DESCRIPTION="MacBook Pro"
diff --git a/buildbot_slave/dicarlolab_config.sh b/buildbot_slave/dicarlolab_config.sh
new file mode 100644
index 0000000..47c0a8a
--- /dev/null
+++ b/buildbot_slave/dicarlolab_config.sh
@@ -0,0 +1,2 @@
+ADMIN_INFO="Christopher Stawarz <cstawarz@mit.edu>"
+MACHINE_DESCRIPTION="Mac mini (Intel Core 2 Duo)"
diff --git a/buildbot_slave/start_buildbot_slave_local.sh b/buildbot_slave/start_buildbot_slave_local.sh
index 0b02200..d2d93f6 100755
--- a/buildbot_slave/start_buildbot_slave_local.sh
+++ b/buildbot_slave/start_buildbot_slave_local.sh
@@ -9,8 +9,12 @@ HOST="localhost"
 PORT="7355"
 ARCHITECTURE="x86_64-OSX-10.6"
 USER=`whoami`
-ADMIN_INFO="Dave <cox@rowland.harvard.edu>"
-MACHINE_DESCRIPTION="MacBook Pro"
+
+if ! [ -f local_config.sh ]; then
+    echo "ERROR: local_config.sh not found"
+    exit 1
+fi
+. local_config.sh
 
 mkdir -p $SLAVE_DIRECTORY
 rm -rf $SLAVE_DIRECTORY