diff --git a/ChangeLog.n b/ChangeLog.n
index 579c3cc8d8adf4a9c17c80a278108b8a60fe46b1..04ac1f0463eab5001821f79d6eb45fe8977b102e 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -10,12 +10,28 @@ If there are user-visible changes in this commit, then list the
 <standard changelog date stamp>
 	* <changes go here...>
 
+*******************************************************************************
+join from acl62 to trunk on 8/14/2002
+command:
+   *********** THE FOLLOWING COMMAND IS WRONG:
+  ./join.sh acl62 acl62_to_trunk_merge1 acl62_to_trunk_merge1 clim2
+   *********** IT SHOULD HAVE BEEN:
+  ./join.sh acl62 acl62_to_trunk_merge1 acl62_to_trunk_merge2 clim2
+
 *******************************************************************************
 join from acl62 to trunk on 7/9/02
 
 *******************************************************************************
 <no version change>
 
+2002-08-09  Duane Rettig  <duane@beta>
+
+	* Makefile: Added power64 port
+	* Makefile.power64: New file for power64
+
+*******************************************************************************
+<no version change>
+
 2002-06-08  Kevin Layer  <layer@crikey>
 
 	* Makefile.macosx: work in progress
diff --git a/Makefile b/Makefile
index e481a268f86bc5a7d80b0b110452880e3d836746..75fded94d50d61c1b33264b2d61c8ca0a0df9c43 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Header: /repo/cvs.copy/clim2/Makefile,v 1.91 2002/07/09 20:57:14 layer Exp $
+# $Header: /repo/cvs.copy/clim2/Makefile,v 1.92 2002/08/14 17:49:28 layer Exp $
 
 # If ../makefile.top doesn't exist, then you must specify HOST=xxx on the
 # `make' command line.
@@ -45,8 +45,12 @@ HOST = sgi4d-svr4
 endif
 
 ifeq ($(OS_NAME),aix)
+ifeq ($(SIXTYFOURBIT),yes)
+HOST = power64
+else
 HOST = rs6000
 endif
+endif
 
 ifeq ($(OS_NAME),osf1)
 ifeq ($(MACHINE),alpha)
diff --git a/Makefile.power64 b/Makefile.power64
new file mode 100644
index 0000000000000000000000000000000000000000..20e6db9fedd80f61f277a204f51220ee650e6b02
--- /dev/null
+++ b/Makefile.power64
@@ -0,0 +1,39 @@
+# $Header: /repo/cvs.copy/clim2/Makefile.power64,v 1.2 2002/08/14 17:49:28 layer Exp $
+#
+#  Makefile.rs6000 for CLIM 2.0
+#
+
+include Makefile.defs
+
+Makefile=Makefile.power64
+
+## For info on Motif1.2 vs Motif 2.1, see /usr/lpp/X11/README
+##
+
+CFLAGS	= -q64 -DAcl64Bit -O -D_BSD -I/usr/include/Motif1.2
+
+### the R5 directory contains Motif 1.2 on loveshaq
+### -- what a botch.  Can't use the latest X11 just because we want
+###    to use an older Motif!  How I love AIX.... not!
+SET_LIBRARY_PATH= \
+  LIBPATH=/usr/lpp/X11/lib/R6:/lib:/usr/lib; export LIBPATH; env
+
+TKLIB=-L/usr/lpp/X11/lib/R6/Motif2.1 -lXm
+
+XTLIB=-lXt
+XLIB=-lX11
+
+XINCLUDES= -I/usr/include/Motif2.1
+
+PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS)
+MAKE_SHARED = sh ../src/bin/make_shared.ibm64 -make_exp ../src/bin/make_exp
+STD_DEFINES =
+AR = ar -X64 clq
+
+# This should be defined in make-dist. For CLIM devel (ie making
+# slim images) we use climdcl-devel and don't use the shared library
+IMPORTS = stub-x.o stub-xt.o stub-motif.o ../src/lisp.exp
+
+stubs = c2stubs
+
+include Makefile.generic