diff --git a/Tools/completion/bash/_waf b/Tools/completion/bash/_waf
index ca76cec583..98e504c0c7 100644
--- a/Tools/completion/bash/_waf
+++ b/Tools/completion/bash/_waf
@@ -53,8 +53,7 @@ _waf()
 
     case $prev in 
       --board)
-        # get options between board and debug, remove everything before "are", remove everything after "--debug", remove final dot, remove all comma
-        opts=$(./waf --help | sed -n '/--board=/,/--debug/p' | sed -e 's/.*are //g' -e 's/\(--debug.*\)//g' -e 's/[.]//g' -e 's/[,]//g')
+        opts=$(./waf list_boards | sed -e '$d')
         COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
         return 0
         ;;
diff --git a/Tools/completion/zsh/_waf b/Tools/completion/zsh/_waf
index c791a5145e..a5331067ef 100644
--- a/Tools/completion/zsh/_waf
+++ b/Tools/completion/zsh/_waf
@@ -39,8 +39,7 @@ _waf() {
 
 (( $+functions[_waf_boards] )) ||
 _waf_boards() {
-  # get option between board and debug, remove everything before "are", remove everything after "--debug", remove final dot, remove all comma
-  local boards; boards=( $(./waf --help | sed -n '/--board=/,/--debug/p' | sed -e 's/.*are //g' -e 's/\(--debug.*\)//g' -e 's/[.]//g' -e 's/[,]//g') )
+  local boards; boards=( $(./waf list_boards | sed -e '$d'))
   _describe -t boards 'board' boards "$@" && ret=0
 }