diff --git a/lisp/bindings.el b/lisp/bindings.el
index 563d4f73352..9ee6c3fa306 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -173,6 +173,8 @@ corresponding to the mode line clicked."
     (:propertize ("" (:eval (if (frame-parameter nil 'client) "@" "")))
 		 help-echo "emacsclient frame"))
   "Mode-line control for identifying emacsclient frames.")
+;; Autoload all risky properties if this file no longer dumped.
+(put 'mode-line-client 'risky-local-variable t)
 
 (defvar mode-line-mule-info
   `(""
@@ -214,6 +216,7 @@ mnemonics of the following coding systems:
   ;;  coding system for encoding text to send to buffer process (if any)."
 )
 
+(put 'mode-line-mule-info 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-mule-info)
 
 ;; MSDOS frames have window-system, but want the Fn identification.
@@ -235,6 +238,7 @@ Value is used for `mode-line-frame-identification', which see."
 Mode-line control for displaying info on process status.
 Normally nil in most modes, since there is no process to display.")
 
+(put 'mode-line-process 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-process)
 
 (defvar mode-line-modified
@@ -265,6 +269,7 @@ Normally nil in most modes, since there is no process to display.")
 	 'mouse-face 'mode-line-highlight))
   "Mode-line control for displaying whether current buffer is modified.")
 
+(put 'mode-line-modified 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-modified)
 
 (defvar mode-line-remote
@@ -281,6 +286,7 @@ Normally nil in most modes, since there is no process to display.")
 					     "Current directory is local: ")
 					   default-directory)))))))
   "Mode-line flag to show if default-directory for current buffer is remote.")
+(put 'mode-line-remote 'risky-local-variable t)
 
 (make-variable-buffer-local 'mode-line-remote)
 
@@ -289,9 +295,11 @@ Normally nil in most modes, since there is no process to display.")
   "Mode-line control for displaying the position in the buffer.
 Normally displays the buffer percentage and, optionally, the
 buffer size, the line number and the column number.")
+(put 'mode-line-position 'risky-local-variable t)
 
 (defvar mode-line-modes nil
   "Mode-line control for displaying major and minor modes.")
+(put 'mode-line-modes 'risky-local-variable t)
 
 (defvar mode-line-mode-menu (make-sparse-keymap "Minor Modes") "\
 Menu of mode operations in the mode line.")
@@ -470,6 +478,7 @@ Its default value is (\"%12b\") with some text properties added.
 Major modes that edit things other than ordinary files may change this
 \(e.g. Info, Dired,...)")
 
+(put 'mode-line-buffer-identification 'risky-local-variable t)
 (make-variable-buffer-local 'mode-line-buffer-identification)
 
 (defun unbury-buffer () "\
@@ -576,6 +585,7 @@ STRING is included in the mode line if VARIABLE's value is non-nil.
 
 Actually, STRING need not be a string; any possible mode-line element
 is okay.  See `mode-line-format'.")
+(put 'minor-mode-alist 'risky-local-variable t)
 ;; Don't use purecopy here--some people want to change these strings.
 (setq minor-mode-alist
       '((abbrev-mode " Abbrev")
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index 56a2fd715d2..b0e8cac51e5 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -175,6 +175,7 @@
     ((5) (50 110) ,#'(lambda () (+ 1900 parse-time-elt)))
     ((5) (0 49) ,#'(lambda () (+ 2000 parse-time-elt))))
   "(slots predicate extractor...)")
+;;;###autoload(put 'parse-time-rules 'risky-local-variable t)
 
 ;;;###autoload
 (defun parse-time-string (string)
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index cbab591d4bf..ab9cae6fed8 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -145,6 +145,7 @@ Any other non-nil version means case is not significant."
 		 (const :tag "like search" case-fold-search)
 		 (other :tag "on" t))
   :group 'dabbrev)
+;;;###autoload(put 'dabbrev-case-fold-search 'risky-local-variable t)
 
 (defcustom dabbrev-upcase-means-case-search nil
   "The significance of an uppercase character in an abbreviation.
@@ -185,6 +186,7 @@ This variable has an effect only when the value of
 		 (const :tag "based on `case-replace'" case-replace)
 		 (other :tag "on" t))
   :group 'dabbrev)
+;;;###autoload(put 'dabbrev-case-replace 'risky-local-variable t)
 
 (defcustom dabbrev-abbrev-char-regexp nil
   "Regexp to recognize a character in an abbreviation or expansion.
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 88c67d8dece..0ba7295cc06 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -75,6 +75,8 @@ Other variables include that for syntactic keyword fontification,
 functions, `font-lock-fontify-buffer-function',
 `font-lock-unfontify-buffer-function', `font-lock-fontify-region-function',
 `font-lock-unfontify-region-function', and `font-lock-inhibit-thing-lock'.")
+;; Autoload if this file no longer dumped.
+(put 'font-lock-defaults 'risky-local-variable t)
 (make-variable-buffer-local 'font-lock-defaults)
 
 (defvar font-lock-defaults-alist nil
diff --git a/lisp/format.el b/lisp/format.el
index ddca9872f35..f15026147c7 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -136,6 +136,8 @@ MODE-FN, if specified, is called when visiting a file with that format.
 
 PRESERVE, if non-nil, means that `format-write-file' should not remove
           this format from `buffer-file-format'.")
+;; Autoload if this file no longer dumped.
+(put 'format-alist 'risky-local-variable t)
 
 ;;; Basic Functions (called from Lisp)
 
diff --git a/lisp/imenu.el b/lisp/imenu.el
index 3873136f693..77035c602d8 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -198,6 +198,7 @@ For example, see the value of `fortran-imenu-generic-expression' used by
 `fortran-mode' with `imenu-syntax-alist' set locally to give the
 characters which normally have \"symbol\" syntax \"word\" syntax
 during matching.")
+;;;###autoload(put 'imenu-generic-expression 'risky-local-variable t)
 
 ;;;###autoload
 (make-variable-buffer-local 'imenu-generic-expression)
@@ -444,6 +445,7 @@ if it is a sub-alist.
 
 There is one simple element with negative POSITION; selecting that
 element recalculates the buffer's index alist.")
+;;;###autoload(put 'imenu--index-alist 'risky-local-variable t)
 
 (make-variable-buffer-local 'imenu--index-alist)
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 6579297ba0c..4d4e5c87798 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1337,6 +1337,8 @@ This function is called with no argument.")
 Each element has the form:
    (INPUT-METHOD LANGUAGE-ENV ACTIVATE-FUNC TITLE DESCRIPTION ARGS...)
 See the function `register-input-method' for the meanings of the elements.")
+;; Autoload if this file no longer dumped.
+(put 'input-method-alist 'risky-local-variable t)
 
 (defun register-input-method (input-method lang-env &rest args)
   "Register INPUT-METHOD as an input method for language environment LANG-ENV.
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index dad696f5355..8ca36ed1f70 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -46,6 +46,7 @@ a file name as a string."
 			       (string :tag "File Name")
 			       sexp)))
   :group 'rmail-output)
+;;;###autoload(put 'rmail-output-file-alist 'risky-local-variable t)
 
 (defcustom rmail-fields-not-to-output nil
   "Regexp describing fields to exclude when outputting a message to a file.
diff --git a/lisp/outline.el b/lisp/outline.el
index 250f2e16335..703e818f3a5 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -380,6 +380,7 @@ See the command `outline-mode' for more information on this mode."
   "*Function of no args to compute a header's nesting level in an outline.
 It can assume point is at the beginning of a header line and that the match
 data reflects the `outline-regexp'.")
+;;;###autoload(put 'outline-level 'risky-local-variable t)
 
 (defvar outline-heading-alist ()
   "Alist associating a heading for every possible level.
diff --git a/lisp/time.el b/lisp/time.el
index 912ab43c481..1d0b951e4a4 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -105,6 +105,7 @@ A value of nil means 1 <= hh <= 12, and an AM/PM suffix is used."
   :group 'display-time)
 
 (defvar display-time-string nil)
+;;;###autoload(put 'display-time-string 'risky-local-variable t)
 
 (defcustom display-time-hook nil
   "List of functions to be called when the time is updated on the mode line."
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index f84cf576343..20fd73d641f 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -1,7 +1,8 @@
 ;;; vc-hooks.el --- resident support for version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+;;   Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
@@ -204,6 +205,8 @@ individually should stay local."
 ;; Tell Emacs about this new kind of minor mode
 ;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode))
 
+;; Autoload if this file no longer dumped.
+(put 'vc-mode 'risky-local-variable t)
 (make-variable-buffer-local 'vc-mode)
 (put 'vc-mode 'permanent-local t)
 
diff --git a/lisp/window.el b/lisp/window.el
index 27daf684e3f..a4931d446a1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -591,6 +591,8 @@ and `same-window-regexps'.  Those variables take precedence over
 this one.
 
 See also `special-display-regexps'."
+  ;; Autoload if this file no longer dumped.
+  :risky t
   :type '(repeat
 	  (choice :tag "Buffer"
 		  :value ""