diff --git a/Tools/ardupilotwaf/boards.py b/Tools/ardupilotwaf/boards.py
index 4dc87042ee..58b9fdc655 100644
--- a/Tools/ardupilotwaf/boards.py
+++ b/Tools/ardupilotwaf/boards.py
@@ -404,7 +404,11 @@ Please use a replacement build as follows:
 
         boards = _board_classes.keys()
         if not ctx.env.BOARD in boards:
-            ctx.fatal("Invalid board '%s': choices are %s" % (ctx.env.BOARD, ', '.join(sorted(boards, key=str.lower))))
+            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))
         _board = _board_classes[ctx.env.BOARD]()
     return _board