diff --git a/source/Commands/CommandObjectTarget.cpp b/source/Commands/CommandObjectTarget.cpp
index 6f77106..8c46487 100644
--- a/source/Commands/CommandObjectTarget.cpp
+++ b/source/Commands/CommandObjectTarget.cpp
@@ -239,6 +239,13 @@
 
             if (target_sp)
             {
+                if (file_path)
+                {
+                    // Use exactly what the user typed as the first argument
+                    // when we exec or posix_spawn
+                    target_sp->SetArg0 (file_path);
+                }
+
                 debugger.GetTargetList().SetSelectedTarget(target_sp.get());
                 if (core_file)
                 {