diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 091971209e5..fa941f80ea3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-29  Eli Zaretskii  <eliz@elta.co.il>
+
+	* international/mule-cmds.el (reset-language-environment)
+	(set-language-environment): Don't invoke fontset-related functions
+	if fontset-list is not fboundp.
+
 2003-12-29  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule-cmds.el (reset-language-environment): Call
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 18ddf566c7b..dca8b80744e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1693,7 +1693,10 @@ The default status is as follows:
   (setq nonascii-translation-table nil
 	nonascii-insert-offset 0)
 
-  (set-overriding-fontspec-internal nil))
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (and (fboundp 'fontset-list)
+       (set-overriding-fontspec-internal nil)))
 
 (reset-language-environment)
 
@@ -1800,10 +1803,13 @@ specifies the character set for the major languages of Western Europe."
       (require (car required-features))
       (setq required-features (cdr required-features))))
 
-  (let ((overriding-fontspec (get-language-info language-name 
-						'overriding-fontspec)))
-    (if overriding-fontspec
-	(set-overriding-fontspec-internal overriding-fontspec)))
+  ;; Don't invoke fontset-related functions if fontsets aren't
+  ;; supported in this build of Emacs.
+  (when (fboundp 'fontset-list)
+    (let ((overriding-fontspec (get-language-info language-name 
+						  'overriding-fontspec)))
+      (if overriding-fontspec
+	  (set-overriding-fontspec-internal overriding-fontspec))))
 
   (let ((func (get-language-info language-name 'setup-function)))
     (if (functionp func)