diff --git a/python-packages/gdbrunner/__init__.py b/python-packages/gdbrunner/__init__.py
index f399d732f..5e07ad375 100644
--- a/python-packages/gdbrunner/__init__.py
+++ b/python-packages/gdbrunner/__init__.py
@@ -189,9 +189,14 @@ def start_gdbserver(device, gdbserver_local_path, gdbserver_remote_path,
     if run_as_cmd:
         gdbserver_cmd = run_as_cmd + gdbserver_cmd
 
-    gdbserver_output_path = os.path.join(tempfile.gettempdir(),
-                                         "gdbclient.log")
-    print("Redirecting gdbserver output to {}".format(gdbserver_output_path))
+    if lldb:
+        gdbserver_output_path = os.path.join(tempfile.gettempdir(),
+                                             "lldb-client.log")
+        print("Redirecting lldb-server output to {}".format(gdbserver_output_path))
+    else:
+        gdbserver_output_path = os.path.join(tempfile.gettempdir(),
+                                             "gdbclient.log")
+        print("Redirecting gdbserver output to {}".format(gdbserver_output_path))
     gdbserver_output = file(gdbserver_output_path, 'w')
     return device.shell_popen(gdbserver_cmd, stdout=gdbserver_output,
                               stderr=gdbserver_output)
diff --git a/scripts/gdbclient.py b/scripts/gdbclient.py
index 2d2dfcbc2..d7c8ecb8e 100755
--- a/scripts/gdbclient.py
+++ b/scripts/gdbclient.py
@@ -437,7 +437,10 @@ def do_main():
         linker_search_dir = ensure_linker(device, sysroot, interp)
 
         tracer_pid = get_tracer_pid(device, pid)
-        use_lldb = args.lldb
+        if os.path.basename(__file__) == 'gdbclient.py' and not args.lldb:
+            print("gdb is deprecated in favor of lldb. "
+                  "If you can't use lldb, please set --no-lldb and file a bug asap.")
+        use_lldb = not args.no_lldb
         if tracer_pid == 0:
             cmd_prefix = args.su_cmd
             if args.env:
diff --git a/scripts/lldbclient.py b/scripts/lldbclient.py
new file mode 120000
index 000000000..96364a8df
--- /dev/null
+++ b/scripts/lldbclient.py
@@ -0,0 +1 @@
+gdbclient.py
\ No newline at end of file