diff --git a/modules/os/macos/doctor.el b/modules/os/macos/doctor.el
new file mode 100644
index 000000000..f9684be69
--- /dev/null
+++ b/modules/os/macos/doctor.el
@@ -0,0 +1,6 @@
+;;; os/macos/doctor.el -*- lexical-binding: t; -*-
+
+;; See https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-08/msg00560.html
+(when (version< emacs-version "29.3")
+  (warn! "There are bugs in multi-user Keychain integration on Emacs <=29.2")
+  (explain! "See https://lists.gnu.org/archive/html/bug-gnu-emacs/2023-08/msg00560.html"))