Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -772,8 +772,12 @@
 
 # llgo builders.
 def _get_llgo_builders():
-    # No build slaves set up for llgo yet.
-    return []
+    return [
+          {'name': "llgo-x86_64-linux",
+           'slavenames': ["llgo-builder"],
+           'builddir': "llgo-x86_64-linux",
+           'factory': LLGoBuilder.getLLGoBuildFactory()},
+    ]
 
 
 # Sanitizer builders.
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -183,6 +183,8 @@
             max_builds=1),
         # Darwin 13.4.0, x86_64
         create_slave("lldb-x86_64-darwin-13.4", properties={'jobs': 16, 'loadaverage':32}, max_builds=1),
+        # Ubuntu 14.04 x86_64, Intel(R) Xeon(R) CPU @ 2.30GHz
+        create_slave("llgo-builder", properties={'jobs': 2}, max_builds=1),
         # Defunct.
         # Intel(R) Pentium(R) CPU G620 @ 2.60GHz, Ubuntu i686
         #create_slave("botether", properties={'jobs': 2}, max_builds=1),
Index: buildbot/osuosl/master/config/status.py
===================================================================
--- buildbot/osuosl/master/config/status.py
+++ buildbot/osuosl/master/config/status.py
@@ -113,4 +113,13 @@
             builders = ["llvm-s390x-linux1"],
             addLogs=False,
             num_lines = 15),
+        InformativeMailNotifier(
+            fromaddr = "llvm.buildmaster@lab.llvm.org",
+            sendToInterestedUsers= False,
+            extraRecipients = ["axwalk@gmail.com","peter@pcc.me.uk"],
+            subject="Build %(builder)s Failure",
+            mode = "failing",
+            builders = ["llgo-x86_64-linux"],
+            addLogs=False,
+            num_lines = 15),
         ]