diff --git a/code/commandline.lisp b/code/commandline.lisp
index 5c44c4767ee45d19ae3e5308e1d9074e879374be..caf6910f022074eb68138561bf0eeca2d08d9875 100644
--- a/code/commandline.lisp
+++ b/code/commandline.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.13 2003/01/29 19:47:47 toy Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.14 2004/06/20 17:00:36 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -191,17 +191,6 @@
   (load (cmd-switch-arg switch)))
 (defswitch "load" #'load-switch-demon)
 
-(defun quiet-switch-demon (switch)
-  (declare (ignore switch))
-  (setq *load-verbose* nil
-        *compile-verbose* nil
-        *compile-print* nil
-        *compile-progress* nil
-        *require-verbose* nil
-        *gc-verbose* nil
-        *herald-items* nil))
-(defswitch "quiet" #'quiet-switch-demon)
-        
 (defun cmd-switch-arg (switch)
   (or (cmd-switch-value switch)
       (car (cmd-switch-words switch))
@@ -215,3 +204,4 @@
 (defswitch "batch")
 (defswitch "dynamic-space-size")
 (defswitch "lib")
+(defswitch "quiet")
diff --git a/code/save.lisp b/code/save.lisp
index 460164def30ce63abab5e10b44bfd1f2a614646e..5719cd4c071e3645005c2f7ece95a1745c521552 100644
--- a/code/save.lisp
+++ b/code/save.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.51 2003/06/18 09:23:10 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.52 2004/06/20 17:00:36 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -198,6 +198,14 @@
 				 :test #'(lambda (x y)
 					   (declare (simple-string x y))
 					   (string-equal x y)))))
+               (when (and process-command-line (find-switch "quiet"))
+                 (setq *load-verbose* nil
+                       *compile-verbose* nil
+                       *compile-print* nil
+                       *compile-progress* nil
+                       *require-verbose* nil
+                       *gc-verbose* nil
+                       *herald-items* nil))
 	       (when (and site-init
 			  (not (and process-command-line
 				    (find-switch "nositeinit"))))