diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index a4cd4f159..b235435aa 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar  5 20:30:24 1997  Gary Houston  <ghouston@actrix.gen.nz>
+
+	* boot-9.scm: check use-emacs-interface for emacs support.
+
 Sun Mar  2 19:47:14 1997  Gary Houston  <ghouston@actrix.gen.nz>
 
 	* boot-9.scm (scm-style-repl): call repl-report-start-timing if
diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index f1eecffd8..f906ec914 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -3668,8 +3668,7 @@
 ;;; *fixme* This is a temporary solution.
 ;;;
 
-(if (or (member "-e" (cdr (program-arguments)))
-	(member "--emacs" (cdr (program-arguments))))
+(if use-emacs-interface
     (define-module (guile) :use-module (ice-9 emacs)))