diff --git a/envsetup.sh b/envsetup.sh
index 1d0b1e92a9..78781f9330 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -996,6 +996,9 @@ function gdbclient()
        local EXE="$1"
        if [ "$EXE" ] ; then
            EXE=$1
+           if [[ $EXE =~ ^[^/].* ]] ; then
+               EXE="system/bin/"$EXE
+           fi
        else
            EXE="app_process"
        fi