--- cus-dep.el.~1.47.~	2009-11-09 09:08:51.000000000 +1100
+++ cus-dep.el	2009-12-31 07:26:35.000000000 +1100
@@ -26,6 +26,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(require 'autoload) ;; for defvar generated-autoload-load-name
 (require 'widget)
 (require 'cus-face)
 
@@ -60,10 +61,13 @@
                         (string-match preloaded file)
                         (not (file-exists-p file)))
               (erase-buffer)
+              (kill-all-local-variables)
               (insert-file-contents file)
+              (hack-local-variables)
               (goto-char (point-min))
               (string-match "\\`\\(.*\\)\\.el\\'" file)
-              (let ((name (file-name-nondirectory (match-string 1 file)))
+              (let ((name (or generated-autoload-load-name
+			      (file-name-nondirectory (match-string 1 file))))
                     (load-file-name file))
                 (if (save-excursion
                       (re-search-forward