Index: zorg/trunk/buildbot/osuosl/master/config/builders.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/builders.py
+++ zorg/trunk/buildbot/osuosl/master/config/builders.py
@@ -72,6 +72,18 @@
                           "-DCMAKE_C_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang",
                           "-DCMAKE_CXX_COMPILER:FILEPATH=/local/clang+llvm-3.7.1-x86_64-linux-gnu-ubuntu-14.04/bin/clang++"
                         ])}
+        {'name': "llvm-avr-linux",
+         'slavenames':["avr-build-01"],
+         'builddir':"llvm-avr-linux",
+         'factory': LLVMBuilder.getLLVMCMakeBuildFactory(
+                        timeout=40, config_name='Release',
+                        enable_shared=True,
+                        extra_cmake_args=[
+                          "-G", "Unix Makefiles",
+                          "-DCMAKE_BUILD_TYPE:STRING=Release",
+                          "-DLLVM_TARGETS_TO_BUILD:STRING=AVR",
+                          "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:STRING=AVR",
+                        ])}
         ]
 
 # Clang fast builders.
Index: zorg/trunk/buildbot/osuosl/master/config/slaves.py
===================================================================
--- zorg/trunk/buildbot/osuosl/master/config/slaves.py
+++ zorg/trunk/buildbot/osuosl/master/config/slaves.py
@@ -104,6 +104,9 @@
         create_slave("hexagon-build-03", properties={'jobs': 16, 'loadaverage':32},
             max_builds=1),
 
+        # Ubuntu x86-64
+        create_slave("avr-build-01", properties={'jobs': 2}, max_builds=1),
+
         # Cavium Octeon II V0.8, MIPS64r2 big endian, Debian Jessie
         create_slave("mipsswbrd002", properties={'jobs' : 6}, max_builds=1),