diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 454cabad9dcc4..c94789320a0d8 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -404,11 +404,7 @@ def get_board(ctx):
 
         boards = _board_classes.keys()
         if not ctx.env.BOARD in boards:
-            ctx.fatal(
-                "Invalid board '%s': choices are\n%sInvalid board '%s'.  Options shown above this line." %
-                (ctx.env.BOARD,
-                 ''.join(["  %s\n" % x for x in sorted(boards, key=str.lower)]),
-                 ctx.env.BOARD))
+            ctx.fatal("Invalid board '%s': choices are %s" % (ctx.env.BOARD, ', '.join(sorted(boards, key=str.lower))))
         _board = _board_classes[ctx.env.BOARD]()
     return _board