diff --git a/setup_board b/setup_board
index c7ac454..dfb775f 100755
--- a/setup_board
+++ b/setup_board
@@ -157,6 +157,13 @@
 EOF
   wrappers+=( "${wrapper}" )
 
+  wrapper="/usr/local/bin/gdb-${BOARD_VARIANT}"
+  sudo_clobber "${wrapper}" <<EOF
+#!/bin/sh
+exec cros_gdb --board="${BOARD_VARIANT}" "\$@"
+EOF
+  wrappers+=( "${wrapper}" )
+
   cmds+=(
     "chmod a+rx ${wrappers[*]}"
     "chown root:root ${wrappers[*]}"