diff --git a/lisp/org.el b/lisp/org.el
index 04a0f20..88f9ea0 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1266,6 +1266,26 @@ smart            Make point visible, and do insertion/deletion if it is
 	  (const :tag "Show invisible part and do the edit" show)
 	  (const :tag "Be smart and do the right thing" smart)))
 
+(defcustom org-read-setup-file 'ask
+  "Should Org read setup files?
+A setup file can be specified with the #+SETUPFILE keyword.
+When reading someone else Org files, Emacs will try to read
+arbitrary read an arbitrary file on your computer.
+
+The default is to ask users before reading a file.
+Setting this option to 'if-interactive will read the setup
+file when `org-mode' has been called interactively.
+Setting this option to t will always read setup files."
+  :group 'org-startup
+  :version "24.4"
+  :package-version '(Org . "8.0")
+  :type '(choice
+	  (const :tag "Never read a setup file" nil)
+	  (const :tag "Ask before trying to read a setup file" 'ask)
+	  (const :tag "Read a setup file when `org-mode' is called interactively"
+		 'if-interactive)
+	  (const :tag "Always try to read a setup file" t)))
+
 (defcustom org-yank-folded-subtrees t
   "Non-nil means when yanking subtrees, fold them.
 If the kill is a single subtree, or a sequence of subtrees, i.e. if
@@ -4828,8 +4848,10 @@ Support for group tags is controlled by the option
 		     (assoc (car e) org-tag-alist))
 		(push e org-tag-alist))))))))
 
-(defun org-set-regexps-and-options ()
-  "Precompute regular expressions used in the current buffer."
+(defun org-set-regexps-and-options (&optional interactivep)
+  "Precompute regular expressions used in the current buffer.
+If INTERACTIVEP is non-nil, `org-set-regexps-and-options' has
+been called from an interactive call to `org-mode'."
   (when (derived-mode-p 'org-mode)
     (org-set-local 'org-todo-kwd-alist nil)
     (org-set-local 'org-todo-key-alist nil)
@@ -4912,7 +4934,11 @@ Support for group tags is controlled by the option
 		  (setq scripts (read (match-string 2 value)))))
 	     ((and (equal key "SETUPFILE")
 		   ;; Prevent checking in Gnus messages
-		   (not buffer-read-only))
+		   (or (and (eq org-read-setup-file 'if-interactive) interactivep)
+		       (and (eq org-read-setup-file 'ask)
+			    (yes-or-no-p (format "Read setup file %s? " value)))
+		       (eq org-read-setup-file t)
+		       (progn (message "Setup file %s not read" value) (sit-for 2))))
 	      (setq setup-contents (org-file-contents
 				    (expand-file-name
 				     (org-remove-double-quotes value))
@@ -5272,7 +5298,7 @@ The following commands are available:
 	       (if (stringp org-ellipsis) org-ellipsis "..."))))
     (setq buffer-display-table org-display-table))
   (org-set-regexps-and-options-for-tags)
-  (org-set-regexps-and-options)
+  (org-set-regexps-and-options (org-called-interactively-p 'any))
   (when (and org-tag-faces (not org-tags-special-faces-re))
     ;; tag faces set outside customize.... force initialization.
     (org-set-tag-faces 'org-tag-faces org-tag-faces))
@@ -20152,7 +20178,7 @@ This command does many different things, depending on context:
   "Restart Org-mode, to scan again for special lines.
 Also updates the keyword regular expressions."
   (interactive)
-  (org-mode)
+  (call-interactively 'org-mode)
   (message "Org-mode restarted"))
 
 (defun org-kill-note-or-show-branches ()