4 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8cb2f2121cb..5b9b8880db6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* Makefile.in (ELCFILES): Add international/mule-conf.elc.
+	* loadup.el ("international/mule-conf"): Load the byte compiled version.
+	* international/mule-conf.el: Allow to be byte compiled.
+
 	* international/mule.el (define-charset): Purecopy props.
 	(load-with-code-conversion): Purecopy doc string and file name.
 	(put-charset-property): Purecopy strings.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index ae162d6d3a8..2a9f648ae81 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -861,6 +861,7 @@ ELCFILES = \
 	$(lisp)/international/latexenc.elc \
 	$(lisp)/international/latin1-disp.elc \
 	$(lisp)/international/mule-cmds.elc \
+	$(lisp)/international/mule-conf.elc \
 	$(lisp)/international/mule-diag.elc \
 	$(lisp)/international/mule-util.elc \
 	$(lisp)/international/mule.elc \
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 8805d5c17aa..b32f8a93f7a 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1552,9 +1552,5 @@ for decoding and encoding files, process I/O, etc."
 ;; code.
 (provide 'code-pages)
 
-;; Local variables:
-;; no-byte-compile: t
-;; End:
-
 ;; arch-tag: 7d5fed55-b6df-42f6-8d3d-0011190551f5
 ;;; mule-conf.el ends here
diff --git a/lisp/loadup.el b/lisp/loadup.el
index b531fd02b43..e12d88447ca 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -92,7 +92,7 @@
 (load "emacs-lisp/map-ynp")
 (load "cus-start")
 (load "international/mule")
-(load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake.
+(load "international/mule-conf")
 (load "env")
 (load "format")
 (load "bindings")