diff --git a/Tools/scripts/build_binaries.py b/Tools/scripts/build_binaries.py
index 68b0f88fe4..9e76da1ba9 100755
--- a/Tools/scripts/build_binaries.py
+++ b/Tools/scripts/build_binaries.py
@@ -150,9 +150,12 @@ is bob we will attempt to checkout bob-AVR'''
         try:
             out = self.run_program('waf', ['./waf', 'configure', '--board=BOARDTEST'], False)
             lines = out.split('\n')
-            needle = "BOARDTEST' (choose from"
+            needles = ["BOARDTEST' (choose from", "BOARDTEST': choices are"]
             for line in lines:
-                idx = line.find(needle)
+                for needle in needles:
+                    idx = line.find(needle)
+                    if idx != -1:
+                        break
                 if idx != -1:
                     line = line[idx+len(needle):-1]
                     line = line.replace("'","")