diff --git a/tools/worldbuild.lisp b/tools/worldbuild.lisp
index 7f87e8b5fefe6aebfa42281e0c9c37464b17efbf..c6ffa1f93a5958bb1c9c411bacdc26a44f7ac17e 100644
--- a/tools/worldbuild.lisp
+++ b/tools/worldbuild.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldbuild.lisp,v 1.38 1997/11/04 16:31:33 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldbuild.lisp,v 1.39 1997/12/12 15:28:20 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -105,7 +105,9 @@
     ,@(when (c:backend-featurep :gencgc)
 	'("target:code/scavhook"))
 
-    "target:code/rand"
+    ,@(if (c:backend-featurep :random-mt19937)
+	  '("target:code/rand-mt19937")
+	  '("target:code/rand"))
     "target:code/save"
     "target:code/alieneval"
     "target:code/c-call"
diff --git a/tools/worldcom.lisp b/tools/worldcom.lisp
index fbc34433db4a434a31d1e7745104ac3f70875a87..f46e1b8d36aac5d479c5682c64a6e159bfd8cb97 100644
--- a/tools/worldcom.lisp
+++ b/tools/worldcom.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.75 1997/11/04 16:31:32 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.76 1997/12/12 15:28:19 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -231,7 +231,9 @@
 (comf "target:code/debug" :byte-compile t)
 
 (comf "target:code/query" :byte-compile *byte-compile*)
-(comf "target:code/rand")
+(if (c:backend-featurep :random-mt19937)
+    (comf "target:code/rand-mt19937")
+    (comf "target:code/rand"))
 (comf "target:code/ntrace" :byte-compile *byte-compile*)
 (comf "target:code/profile")
 (comf "target:code/sort")
diff --git a/tools/worldload.lisp b/tools/worldload.lisp
index 017fc45255a8b658f6836dafe6e4a41269a57603..b71b38a297532c074646c91771b6beab0a5dad76 100644
--- a/tools/worldload.lisp
+++ b/tools/worldload.lisp
@@ -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/tools/worldload.lisp,v 1.85 1997/11/27 02:09:21 dtc Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.86 1997/12/12 15:28:21 dtc Exp $
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -96,7 +96,8 @@
 (maybe-byte-load "code:time")
 (maybe-byte-load "code:tty-inspect")
 (maybe-byte-load "code:describe")
-(maybe-byte-load "code:rand")
+#+random-mt19937 (maybe-byte-load "code:rand-mt19937")
+#-random-mt19937 (maybe-byte-load "code:rand")
 (maybe-byte-load "code:ntrace")
 #-runtime (maybe-byte-load "code:profile")
 (maybe-byte-load "code:weak")