diff --git a/ChangeLog.n b/ChangeLog.n
index 33930c5f1917d76bf348ac76233c9a88683996c7..e6302aceeef8710efb750460a1e0a3450d7e76cb 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -11,6 +11,15 @@ Tests for new features:	<`no new features', `no tests for new features', or
 <standard changelog date stamp>
 	* <changes go here...>
 
+*******************************************************************************
+Mon May  5 15:33:46 1997  Kevin Layer  <layer@ultra>
+
+	* Makefile.defs: use ../src/lisp -I ... instead of ../src/dcl
+	* Makefile.generic: fix typo
+	* tk/load-ol.lisp: conditionalize for 5.0 ffi
+	* tk/load-xm.lisp: conditionalize for 5.0 ffi
+	* tk/make-classes.lisp: conditionalize for 5.0 ffi
+
 *******************************************************************************
 Thu Apr 24 10:30:00 EST 1997  Paul Robertson <probertson@doll.com>
 
diff --git a/Makefile.defs b/Makefile.defs
index f0d6d442faa0e20dc99fbe89c4d1c9a18be8b829..950c48cc2ead29eb0850e6d915666cfd6a8da85e 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -1,9 +1,9 @@
-# $Header: /repo/cvs.copy/clim2/Makefile.defs,v 1.39 1997/02/05 01:41:52 tomj Exp $
+# $Header: /repo/cvs.copy/clim2/Makefile.defs,v 1.40 1997/05/05 22:35:16 layer Exp $
 #
 #  Makefile.defs for CLIM 2.0
 #
 
-CL	= ../src/dcl
+CL	= ../src/lisp -I ../src/dcl.dxl
 CLOPTS	= -qq -batch -backtrace-on-error
 
 DEVICE	= /dev/null
diff --git a/Makefile.generic b/Makefile.generic
index aa31e2ee6421a3b4e74cc78eb7786b75711841a8..947a5a04bc60b07c0102753b6d15b0fcb31085f6 100644
--- a/Makefile.generic
+++ b/Makefile.generic
@@ -1,4 +1,4 @@
-# $Header: /repo/cvs.copy/clim2/Makefile.generic,v 1.39 1997/02/05 01:41:54 tomj Exp $
+# $Header: /repo/cvs.copy/clim2/Makefile.generic,v 1.40 1997/05/05 22:35:16 layer Exp $
 #
 #  Makefile.generic for CLIM 2.0
 #
@@ -23,8 +23,9 @@ compile: FORCE $(PRODUCT-OBJS) $(ICS-PRODUCT-OBJS)
 	  (setq sys::*libwnn-pathname* \"$(WNNLIB)\") \
 	  (load \"misc/compile-1.lisp\") \
 	  (proclaim '(optimize (speed $(SPEED)) (debug $(DEBUG)) (safety $(SAFETY)))) \
-	  (let ((*compile-print $(COMPILE_PRINT)) \
+	  (let ((*compile-print* $(COMPILE_PRINT)) \
 		(*compile-verbose* t) \
+		(setf (sys:gsgc-switch :print) nil) \
 		(excl:*redefinition-warnings* t) \
 		(excl:*record-source-file-info* $(RECORD_SOURCE_FILE_INFO)) \
 		(excl:*load-source-file-info* $(LOAD_SOURCE_FILE_INFO)) \
diff --git a/tk/load-ol.lisp b/tk/load-ol.lisp
index 014befe239f0c96064cb6c493494c1f0f00f2a77..ec797a1c59b0279fb68d214c19d534211ef35f98 100644
--- a/tk/load-ol.lisp
+++ b/tk/load-ol.lisp
@@ -17,7 +17,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Header: /repo/cvs.copy/clim2/tk/load-ol.lisp,v 1.29 1997/02/05 01:52:47 tomj Exp $
+;; $Header: /repo/cvs.copy/clim2/tk/load-ol.lisp,v 1.30 1997/05/05 22:35:17 layer Exp $
 
 (in-package :user)
 
@@ -28,7 +28,8 @@
   (defvar sys::*toolkit-shared* nil)
 
   (unless (ff:get-entry-point (ff:convert-to-lang "ol_appl_add_item")
-			      :note-shared-library-references nil)
+			      #-(version>= 5 0) :note-shared-library-references
+			      #-(version>= 5 0) nil)
     (load "clim2:;climol.so")
     (setq sys::*toolkit-shared* t)))
 
diff --git a/tk/load-xm.lisp b/tk/load-xm.lisp
index 16427cc6e2b17c084f0d62bc7d52bbbf0d29ffe0..f3f574c73b2637be04a7ddb3eab7f3c7e841191e 100644
--- a/tk/load-xm.lisp
+++ b/tk/load-xm.lisp
@@ -17,7 +17,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Header: /repo/cvs.copy/clim2/tk/load-xm.lisp,v 1.39 1997/02/05 01:52:49 tomj Exp $
+;; $Header: /repo/cvs.copy/clim2/tk/load-xm.lisp,v 1.40 1997/05/05 22:35:17 layer Exp $
 
 (in-package :user)
 
@@ -25,7 +25,8 @@
 
 #+dlfcn
 (unless (ff:get-entry-point (ff:convert-to-lang "XmCreateMyDrawingArea")
-			    :note-shared-library-references nil)
+			    #-(version>= 5 0) :note-shared-library-references
+			    #-(version>= 5 0) nil)
   (let ((ff::*dlopen-mode* (excl:ics-target-case
 			    (:+ics #x102)
 			    (:-ics ff::*dlopen-mode*))))
diff --git a/tk/make-classes.lisp b/tk/make-classes.lisp
index 7af942f7d9514a5383b7e4861e767b9d7cf62536..262a21d0998cdc88f38d2b4ef0bfe8f1a64428a0 100644
--- a/tk/make-classes.lisp
+++ b/tk/make-classes.lisp
@@ -1,6 +1,6 @@
 ;; -*- mode: common-lisp; package: tk -*-
 ;;
-;;				-[Thu Dec  7 14:49:13 1995 by duane]-
+;;				-[Mon May  5 15:33:02 1997 by layer]-
 ;;
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
@@ -19,7 +19,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Header: /repo/cvs.copy/clim2/tk/make-classes.lisp,v 1.44 1997/02/05 01:52:52 tomj Exp $
+;; $Header: /repo/cvs.copy/clim2/tk/make-classes.lisp,v 1.45 1997/05/05 22:35:17 layer Exp $
 
 (in-package :tk)
 
@@ -27,7 +27,8 @@
   (let ((ep #-dlfcn (ff:get-extern-data-address x)
 	    #+dlfcn (ff:get-entry-point
 		     x
-		     :note-shared-library-references nil)))
+		     #-(version>= 5 0) :note-shared-library-references
+		     #-(version>= 5 0) nil)))
     (unless ep (error "Entry point ~S not found" x))
     (class-array ep 0)))