diff --git a/Makefile b/Makefile
index 7cb1d56c3019a52ce12fb26cd2d795e1c042b21e..8d1efd715a497d02cf6704a8f0144c16bb0da211 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # $fiHeader: Makefile,v 1.74 93/02/10 10:04:04 cer Exp $
-#
-#  Makefile.sun4 for CLIM 2.0
-#
 
-include Makefile.sun4
+HOST = sun4
+
+include Makefile.$(HOST)
diff --git a/Makefile.svr4 b/Makefile.svr4
index 762a87a7404bfaaa57673ab489076884900d07ba..93e9a598f68be6eba23c66adcd71cea084531010 100644
--- a/Makefile.svr4
+++ b/Makefile.svr4
@@ -9,6 +9,8 @@ XLIB-CLIM-OBJS = xlib/pkg.fasl
 MOTIF_OBJS= climxm.so
 OPENLOOK_OBJS= climol.so
 CLIMOBJS= climxm.so climol.so
+INSTALLED_CLIMOBJS= $(CLIMOBJS) xlibsupport.o xtsupport.o olsupport.o \
+		MyDrawingA.o
 
 MOTIFLIB=/usr/lib/libXm$(DEBUGLIB).a
 MOTIFLIB_d=/usr/lib/libXm.a
diff --git a/instclimol.lisp b/instclimol.lisp
index dbc542a58f97e15e12bc176f4d345b770bb8e3d4..a9ce5920eef6065ef04e53efbeb38aa1d2aad4ab 100644
--- a/instclimol.lisp
+++ b/instclimol.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: system -*-
 ;;
-;;				-[Thu Feb 27 12:39:07 1992 by layer]-
+;;				-[Fri Apr 16 11:55:09 1993 by layer]-
 ;; 
 ;; copyright (c) 1991 Franz Inc, Berkeley, CA  All rights reserved.
 ;;
@@ -23,17 +23,17 @@
 ;; $fiHeader: instclimol.lisp,v 1.4 92/08/18 17:54:20 cer Exp Locker: cer $
 
 ;;
-;; Load CLIM
+;; Load the OpenLook version of CLIM
 ;;
 
 (in-package :system)
 
+#-svr4
+(progn
+  (defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
+  (defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a"))
 
-(defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
-(defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a")
+(load-application (require :climol) :devel system::*devel*)
 
-(load-application (require :climol)
-		  :devel system::*devel*)
-
-(format t "~&; Finished loading CLIM~%")
+(format t "~&; Finished loading CLIM OL~%")
 (force-output)
diff --git a/instclimxm.lisp b/instclimxm.lisp
index ea40b782af50889612af961cf5bb4f1197efd44c..cf11b4700fdc0269d5061f8056df1fa63f53a946 100644
--- a/instclimxm.lisp
+++ b/instclimxm.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: system -*-
 ;;
-;;				-[Thu Feb 27 12:39:07 1992 by layer]-
+;;				-[Fri Apr 16 11:55:04 1993 by layer]-
 ;; 
 ;; copyright (c) 1991 Franz Inc, Berkeley, CA  All rights reserved.
 ;;
@@ -23,17 +23,17 @@
 ;; $fiHeader: instclimxm.lisp,v 1.5 92/08/21 16:34:15 cer Exp $
 
 ;;
-;; Load CLIM
+;; Load the Motif version of CLIM
 ;;
 
 (in-package :system)
 
+#-svr4
+(progn
+  (defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
+  (defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a"))
 
-(defvar sys::*libx11-pathname* "/x11/R4/sun4-lib/libX11.a")
-(defvar sys::*libxt-pathname* "/x11/R4/sun4-lib/libXt.a")
+(load-application (require :climxm) :devel system::*devel*)
 
-(load-application (require :climxm) 
-		  :devel system::*devel*)
-
-(format t "~&; Finished loading CLIM~%")
+(format t "~&; Finished loading CLIM XM~%")
 (force-output)
diff --git a/test/test-driver.lisp b/test/test-driver.lisp
index 80925f71a4cd641efb7ecf661ee3f647e1e44bc1..70e29ac58f883c7744c70bb43a776e6ce45241b9 100644
--- a/test/test-driver.lisp
+++ b/test/test-driver.lisp
@@ -585,12 +585,11 @@
 ;;; This should be at the end:
 ;;; make the training selective.
 
-(locally 
-  (declare (special si::*clos-preload-packages*))
- (setq si::*clos-preload-packages* 
-   (mapcar #'find-package '(:clim :clim-utils :clim-internals :silica :tk :xm-silica))))
+(locally (declare (special si::*clos-preload-packages*))
+  (setq si::*clos-preload-packages* 
+    (mapcar #'find-package
+	    '(:clim :clim-utils :clim-internals :silica :tk :xm-silica))))
 
 ;; This stops warnings happening asynchronously and causing confusion.
 
 (setq excl:*global-gc-behavior* nil)
-
diff --git a/tk/load-ol.lisp b/tk/load-ol.lisp
index 4f5b108909fa87fcdf0d280132c0fb3f521e833b..1cdeb539aa2ba9f52b34b3855bd9f661f8fdd126 100644
--- a/tk/load-ol.lisp
+++ b/tk/load-ol.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: user -*-
 ;;
-;;				-[Thu Apr 15 17:05:49 1993 by layer]-
+;;				-[Fri Apr 16 17:38:18 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -28,7 +28,8 @@
 (require :climg)
 
 #+svr4
-(load "climol.so")
+(unless (ff:get-entry-point (ff:convert-to-lang "ol_appl_add_item"))
+  (load "climol.so"))
 
 #-svr4
 (progn
diff --git a/tk/load-xm.lisp b/tk/load-xm.lisp
index 3e661d1da1ba76a9ec29b23e955ba31a73a7dfdf..ef8efde54999895d2746de24bbd5d22f1523c1c5 100644
--- a/tk/load-xm.lisp
+++ b/tk/load-xm.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: user -*-
 ;;
-;;				-[Thu Apr 15 17:05:21 1993 by layer]-
+;;				-[Fri Apr 16 17:38:25 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -28,7 +28,8 @@
 (require :climg)
 
 #+svr4
-(load "climxm.so")
+(unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea"))
+  (load "climxm.so"))
 
 #-svr4
 (progn
diff --git a/tk/make-classes.lisp b/tk/make-classes.lisp
index ef2898878ee8300bb7a0c3fc619b832c93e9d577..6ad18a7f15686f4a2e5453a014b49b0ccfa0fda4 100644
--- a/tk/make-classes.lisp
+++ b/tk/make-classes.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: tk -*-
 ;;
-;;				-[Fri Apr 16 08:55:32 1993 by layer]-
+;;				-[Tue Apr 27 16:10:42 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
diff --git a/utils/excl-verification.lisp b/utils/excl-verification.lisp
index 1a86491ba990d0edf4d719ab240c87af07a7329a..1752430cba1af4f7e51871a06b4061bf8a1f86b4 100644
--- a/utils/excl-verification.lisp
+++ b/utils/excl-verification.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: SYS; Base: 10; Lowercase: Yes -*-
 ;;
-;;				-[]-
+;;				-[Tue Apr 27 18:31:42 1993 by layer]-
 ;; 
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA  All rights reserved.
@@ -59,7 +59,7 @@ You do not have patches ~{~S ~}"
 	   dont-have)))
 
 (defvar *clim-version* 
-    '("CLIM 2.0.beta.0"
+    '("CLIM 2.0.beta2.0"
       "$fiHeader: excl-verification.lisp,v 1.14 92/07/01 15:45:31 cer Exp Locker: cer $"))
 
 (si::rcsnote (first *clim-version*) (second *clim-version*))