diff --git a/bin/doom-doctor b/bin/doom-doctor
index 3f30fb1fb..c4546b34c 100755
--- a/bin/doom-doctor
+++ b/bin/doom-doctor
@@ -114,7 +114,7 @@
           "???")
       (if (and (executable-find "git")
                (file-directory-p (expand-file-name ".git" user-emacs-directory)))
-          (substring (sh "git rev-parse HEAD") 0 8)
+          (sh "git log -1 --format=\"%D %h %ci\"")
         "n/a"))
 (msg! "shell: %s%s"
       (getenv "SHELL")
@@ -300,7 +300,8 @@
    (setq doom-modules nil)))
 
 (section! "Checking Doom core for irregularities...")
-(load (expand-file-name "doctor.el" doom-core-dir) nil 'nomessage)
+(let ((indent 4))
+  (load (expand-file-name "doctor.el" doom-core-dir) nil 'nomessage))
 
 (when (bound-and-true-p doom-modules)
   (section! "Checking your enabled modules...")
diff --git a/core/autoload/debug.el b/core/autoload/debug.el
index 6638fb8de..d830ad4c6 100644
--- a/core/autoload/debug.el
+++ b/core/autoload/debug.el
@@ -16,7 +16,7 @@ ready to be pasted in a bug report on github."
     (format
      (concat "- OS: %s (%s)\n"
              "- Emacs: %s (%s)\n"
-             "- Doom: %s (%s %s)\n"
+             "- Doom: %s (%s)\n"
              "- Graphic display: %s (daemon: %s)\n"
              "- System features: %s\n"
              "- Details:\n"
@@ -31,9 +31,7 @@ ready to be pasted in a bug report on github."
      system-type system-configuration
      emacs-version (format-time-string "%b %d, %Y" emacs-build-time)
      doom-version
-     (or (vc-git--symbolic-ref "core/core.el")
-         "n/a")
-     (or (vc-git-working-revision "core/core.el")
+     (or (string-trim (shell-command-to-string "git log -1 --format=\"%D %h %ci\""))
          "n/a")
      (display-graphic-p) (daemonp)
      (bound-and-true-p system-configuration-features)
diff --git a/core/doctor.el b/core/doctor.el
index baf1de4a7..8ac64af99 100644
--- a/core/doctor.el
+++ b/core/doctor.el
@@ -27,3 +27,11 @@
     (warn! "Your $HOME is recognized as a project root")
     (explain! "Doom will disable bottom-up root search, which may reduce the accuracy of project\n"
               "detection.")))
+
+;; There should only be one
+(when! (and (file-equal-p doom-private-dir "~/.config/doom")
+            (file-directory-p "~/.doom.d"))
+  (warn! "Both %S and '~/.doom.d' exist on your system"
+         (abbreviate-file-name doom-private-dir))
+  (explain! "Doom will only load one of these (~/.config/doom takes precedence). Since\n"
+            "it is rarely intentional that you have both, ~/.doom.d should be removed."))