1 files changed, 5 insertions, 0 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 2f17c312b3b..5a8af21463f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -218,6 +218,11 @@ init_cmdargs (argc, argv, skip_args)
         Vinvocation_directory = Ffile_name_directory (found);
     }
 
+  if (!NILP (Vinvocation_directory)
+      && NILP (Ffile_name_absolute_p (Vinvocation_directory)))
+    /* Emacs was started with relative path, like ./emacs  */
+    Vinvocation_directory = Fexpand_file_name (Vinvocation_directory, Qnil);
+
   Vinstallation_directory = Qnil;
 
   if (!NILP (Vinvocation_directory))