diff --git a/lisp/lib/debug.el b/lisp/lib/debug.el
index 2ee08c149..d43d593f7 100644
--- a/lisp/lib/debug.el
+++ b/lisp/lib/debug.el
@@ -260,7 +260,8 @@ ready to be pasted in a bug report on github."
                              (bound-and-true-p emacs-repository-branch)
                              (and (stringp emacs-repository-version)
                                   (substring emacs-repository-version 0 9))
-                             (symlink-path doom-emacs-dir))))
+                             (format "EMACSDIR=%s" (symlink-path doom-emacs-dir))
+                             (format "EMACS=%s" (expand-file-name invocation-name invocation-directory)))))
         (doom . ,(list doom-version
                        (if doom-profile
                            (format "PROFILE=%s@%s"