diff --git a/code/commandline.lisp b/code/commandline.lisp
index 696b67682246adb15c7312af7a54146dc9db8f18..104334621a8476d2439670a04f45d7df76bdf2bd 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.11 2001/03/04 23:37:32 pw Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/commandline.lisp,v 1.12 2001/12/08 18:42:39 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -210,6 +210,7 @@
 (defswitch "core")
 (defswitch "init")
 (defswitch "noinit")
+(defswitch "nositeinit")
 (defswitch "hinit")
 (defswitch "batch")
 (defswitch "dynamic-space-size")
diff --git a/code/save.lisp b/code/save.lisp
index bd09f4b36bca41090771f2bde82caf23e8650083..a08ce577ee1f27492718f27a8b8f53e9a15cec75 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.41 2001/11/29 01:46:58 pmai Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/save.lisp,v 1.42 2001/12/08 18:42:39 pmai Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -171,7 +171,9 @@
 				 :test #'(lambda (x y)
 					   (declare (simple-string x y))
 					   (string-equal x y)))))
-	       (when site-init
+	       (when (and site-init
+			  (not (and process-command-line
+				    (find-switch "nositeinit"))))
 		 (load site-init :if-does-not-exist nil :verbose nil))
 	       (when (and process-command-line (find-switch "edit"))
 		 (setf *editor-lisp-p* t))
diff --git a/docs/cmu-user/cmu-user.tex b/docs/cmu-user/cmu-user.tex
index 69120a6fbbbfeaca86911be9c2c40ac4d862a680..497b412775c2a5d4e72f5ce6f19d7274ff746175 100644
--- a/docs/cmu-user/cmu-user.tex
+++ b/docs/cmu-user/cmu-user.tex
@@ -11,12 +11,12 @@
 %% distribution, and must be obtained from a repository. At this time
 %% I was able to fetch from
 %% ftp.cdrom.com:pub/tex/ctan/macros/latex/contrib/supported/
-%%			camel/index.ins
-%%			camel/index.dtx
-%%			calc/calc.ins
-%%			calc/calc.dtx
-%%			changebar/changebar.ins
-%%			changebar/changebar.dtx
+%%                      camel/index.ins
+%%                      camel/index.dtx
+%%                      calc/calc.ins
+%%                      calc/calc.dtx
+%%                      changebar/changebar.ins
+%%                      changebar/changebar.dtx
 %% One runs latex on the .ins file to produce .tex and/or .sty
 %% files that must be put in a path searched by latex.
 %%
@@ -1135,6 +1135,11 @@ cmucl(1).  Currently Lisp accepts the following switches:
   Also, this switch suppresses the loading of a hemlock init file when
   Hemlock is started up with the \code{-edit} switch.
   
+\item[\code{-nositeinit}] accepts no arguments and specifies that the
+  site-init file, which can contain site specific initialization code,
+  should not be loaded during the normal start up sequence, even if it
+  exists.
+  
 \item[\code{-load}] accepts an argument which should be the name of a
   file to load into Lisp before entering Lisp's read-eval-print loop.
   
diff --git a/general-info/lisp.1 b/general-info/lisp.1
index 7a9c86d06cf094dc5616c570d5573cfe04a63ec3..ecd98017eddc699bd0c71d7eaee1de0c6bd6d60e 100644
--- a/general-info/lisp.1
+++ b/general-info/lisp.1
@@ -6,7 +6,7 @@
 .\" If you want to use this code or any part of CMU Common Lisp, please contact
 .\" Scott Fahlman or slisp-group@cs.cmu.edu.
 .\"
-.\"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/general-info/lisp.1,v 1.6 1997/07/21 12:22:37 pw Exp $
+.\"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/general-info/lisp.1,v 1.7 2001/12/08 18:42:40 pmai Exp $
 .\"
 .\" **********************************************************************
 .\"
@@ -64,6 +64,9 @@ Suppresses loading of the init file, and also prevents \-edit from loading the
 .I Hemlock
 init file.
 .TP
+.BR \-nositeinit
+Suppresses loading of the site-init site specific initialization file.
+.TP
 .BR \-load " filename"
 Loads the specified file into Lisp before entering Lisp's read-eval-print loop.
 .TP