1 files changed, 4 insertions, 0 deletions

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 100c3f700d1..747476c5067 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -534,6 +534,10 @@ lost after dumping")))
          (equal (nth 2 command-line-args) "loadup"))
     (setcdr command-line-args (nthcdr 3 command-line-args)))
 
+;; Don't keep `load-file-name' set during the top-level session!
+;; Otherwise, it breaks a lot of code which does things like
+;; (or load-file-name byte-compile-current-file).
+(setq load-file-name nil)
 (eval top-level)