diff --git a/ChangeLog.n b/ChangeLog.n
index 4d0acf7a6b9cea59d555a6734c6cea685d9bc0f9..59e080c664bf2e54d8a0e072b0485816d0b4bc1c 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -10,6 +10,31 @@ Tests for new features:	<`no new features', `no tests for new features', or
 <standard changelog date stamp>
 	* <changes go here...>
 
+*******************************************************************************
+2.2.1.6 (merge from 2.2.1.5 branch)
+
+*******************************************************************************
+2.2.1.5.2
+
+Thu Feb 12 19:54:57 1998  Kevin Layer  <layer@ultra>
+
+	* Makefile.generic: add to `clean'
+
+Wed Feb 11 16:53:04 1998    <layer@HOBART>
+
+	* demo/README: fix instructions
+
+*******************************************************************************
+2.2.1.5.1
+
+Fri Feb  6 17:24:48 1998  Kevin Layer  <layer@ultra>
+
+	* Makefile.sgi4d-svr4: -n32, etc
+
+Thu Feb  5 10:15:13 1998  Kevin Layer  <layer@ultra>
+
+	* Makefile.generic: disable the autoload warning
+
 *******************************************************************************
 2.2.1.5
 
diff --git a/Makefile.generic b/Makefile.generic
index 804fbcb0e55c527b1f2948dfbb0193ccb9d7e4a3..6d9c990573bfee63ac934a21fae956b0f2d9ead9 100644
--- a/Makefile.generic
+++ b/Makefile.generic
@@ -1,4 +1,4 @@
-# $Header: /repo/cvs.copy/clim2/Makefile.generic,v 1.44 1998/02/04 22:22:19 layer Exp $
+# $Header: /repo/cvs.copy/clim2/Makefile.generic,v 1.45 1998/02/13 21:04:44 layer Exp $
 #
 #  Makefile.generic for CLIM 2.0
 #
@@ -136,8 +136,11 @@ $(CLIM): FORCE $(PRODUCT-OBJS) $(ICS-PRODUCT-OBJS)
 	       (setq sys::*libwnn-pathname* \"$(WNNLIB)\") \
 	       (load \"misc/dev-load-1.lisp\") \
 	       (load-it '$(SYSTEM)))) \
+	   :autoload-warning nil \
 	   :image-only t \
 	   :purify nil \
+	   :debug-on-error t \
+	   :internal-debug \"build-clim.out\" \
 	   :shlib-warning nil \
 	   :libfasl-warning nil \
 	   :record-source-file-info t :load-source-file-info t \
@@ -222,7 +225,7 @@ clean:
 	find . -name '*.fasl' -print | xargs rm -f
 	rm -f *.o *.$(SHARED_EXT) *.a slim \
 	  	stub-motif.c stub-olit.c stub-xt.c stub-x.c stub-wnn.c
-	rm -f *.z *.Z *.gz *.ilt *.out
+	rm -f *.z *.Z *.gz *.ilt *.out so_locations
 
 clean-notes:
 	cd notes ; find . -name '*.lisp' -print | xargs rm -f
diff --git a/Makefile.sgi4d-svr4 b/Makefile.sgi4d-svr4
index 8ad9f2514e7f49079fa035f06575453c68232bce..9e23b4fade48f51f3db70b6cd0fbb6f16e010e2c 100644
--- a/Makefile.sgi4d-svr4
+++ b/Makefile.sgi4d-svr4
@@ -1,4 +1,4 @@
-# $Header: /repo/cvs.copy/clim2/Makefile.sgi4d-svr4,v 1.11 1997/10/20 23:10:57 layer Exp $
+# $Header: /repo/cvs.copy/clim2/Makefile.sgi4d-svr4,v 1.12 1998/02/13 21:04:44 layer Exp $
 #
 #  Makefile.sigi4d-svr4 for CLIM 2.0
 #
@@ -9,15 +9,15 @@ Makefile=Makefile.sgi4d-svr4
 
 TKLIB=-lXm
 XTLIB=-lXt
-XLIB=-lX11
+XLIB=-lX11 -lcvt
 
 XINCLUDES=-I/usr/include
 
 PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS)
 
-PICFLAGS = -KPIC
+PICFLAGS = -KPIC -n32
 SHAREFLAGS = 
-MAKE_SHARED = ld -shared -all
+MAKE_SHARED = ld -n32 -shared -all
 STD_DEFINES = -DSVR4
 AR = /usr/bin/ar cq
 
diff --git a/demo/README b/demo/README
index fbbbf772acfd1ba3b8cf753026018a492dc45b10..31dae8e572f56e115c7aadcea7d486c97e0991ba 100644
--- a/demo/README
+++ b/demo/README
@@ -1,16 +1,13 @@
-
 ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA  All rights reserved.
 ;; copyright (c) 1986-1991 Franz Inc, Berkeley, CA  All rights reserved.
+;; $Id: README,v 1.4 1998/02/13 21:04:46 layer Exp $
 
-;; $Header: /repo/cvs.copy/clim2/demo/README,v 1.3 1997/02/05 01:46:58 tomj Exp $
-
-To run the CLIM demos.
+Running the CLIM demos:
 
 1. Load the demos with:
 
-	(require :clim-demoxm) 
+	(require :climdemo)
 
 2. To start, evaluate:
 	
 	 (clim-demo:start-demo)
-
diff --git a/utils/packages.lisp b/utils/packages.lisp
index 49688c4626feb20b800f11650c9429e0f3782b01..9a3a497952c76062b985e5b2ad9fe91b3e5586cc 100644
--- a/utils/packages.lisp
+++ b/utils/packages.lisp
@@ -1,6 +1,6 @@
 ;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*-
 
-;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.77 1998/02/04 22:22:20 layer Exp $
+;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.78 1998/02/13 21:04:47 layer Exp $
 
 (in-package :common-lisp-user)
 
@@ -3301,12 +3301,12 @@
 (cl:defvar *clim-major-version* 2)
 (cl:defvar *clim-minor-version* 2)
 (cl:defvar *clim-generation-version* 1)
-(cl:defvar *clim-build-version* 5)
+(cl:defvar *clim-build-version* 6)
 
 (cl:defparameter *clim-version*
-    (cl:format () "CLIM ~d.~d.~d.~d"
+    (cl:format () "CLIM ~d.~d.~d.~a"
 	       *clim-major-version* *clim-minor-version*
 	       *clim-generation-version* *clim-build-version*))
 
 #-aclpc
-(si::rcsnote *clim-version* "$Id: packages.lisp,v 1.77 1998/02/04 22:22:20 layer Exp $")
+(si::rcsnote *clim-version* "$Id: packages.lisp,v 1.78 1998/02/13 21:04:47 layer Exp $")