diff --git a/lisp/cli/upgrade.el b/lisp/cli/upgrade.el
index d42017caa..acaf37a3d 100644
--- a/lisp/cli/upgrade.el
+++ b/lisp/cli/upgrade.el
@@ -21,6 +21,7 @@
 (defcli! ((upgrade up))
     ((packages?  ("-p" "--packages") "Only upgrade packages, not Doom")
      (jobs       ("-j" "--jobs" num) "How many CPUs to use for native compilation")
+     (nobuild?   ("-B") "Don't rebuild packages when hostname or Emacs version has changed")
      &context context)
   "Updates Doom and packages.
 
@@ -32,7 +33,9 @@ following shell commands:
     doom clean
     doom sync -u"
   (let* ((force? (doom-cli-context-suppress-prompts-p context))
-         (sync-cmd (append '("sync" "-u") (if jobs `("-j" ,num)))))
+         (sync-cmd (append '("sync" "-u")
+                           (if nobuild? '("-B"))
+                           (if jobs `("-j" ,num)))))
     (cond
      (packages?
       ;; HACK It's messy to use straight to upgrade straight, due to the
@@ -55,6 +58,7 @@ following shell commands:
       (print! (item "Reloading Doom Emacs"))
       (doom-cli-context-put context 'upgrading t)
       (exit! "doom" "upgrade" "-p"
+             (if nobuild? "-B")
              (if force? "--force")
              (if jobs (format "--jobs=%d" jobs))))