diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index f386a5926..b3cbcb067 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,7 @@
+1998-06-15  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
+
+	* emacs.scm (emacs-load): New feature: Eval in specified module.
+
 1998-06-14  Mikael Djurfeldt  <mdj@mdj.nada.kth.se>
 
 	* readline.scm: Typo in regex module name.
diff --git a/ice-9/emacs.scm b/ice-9/emacs.scm
index 7a9f21a5d..d814711e0 100644
--- a/ice-9/emacs.scm
+++ b/ice-9/emacs.scm
@@ -132,11 +132,16 @@
 	      (lambda ()
 		(let loop ((endp (flush-whitespace %%load-port)))
 		  (if (not endp)
-		      (let ((result
-			     (start-stack read-and-eval!
-					  (read-and-eval! %%load-port))))
-			(if interactivep
-			    (result-to-emacs result))
+		      (begin
+			(save-module-excursion
+			 (lambda ()
+			   (if module
+			       (set-current-module (resolve-module module #f)))
+			   (let ((result
+				  (start-stack read-and-eval!
+					       (read-and-eval! %%load-port))))
+			     (if interactivep
+				 (result-to-emacs result)))))
 			(loop (flush-whitespace %%load-port)))
 		      (begin
 			(load-acknowledge))))