diff --git a/Makefile.am b/Makefile.am
index 762ecb04..e5f96e1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,13 +35,13 @@ EXTRA_DIST = include include/*.h \
 	     doc/*txt doc/*.pdf \
 	     Readme*.txt autogen.sh 
 
-if X86
+if cpu_64
 CASALIBDIR = lib64
 else
 CASALIBDIR = lib
 endif
 
-if X86
+if cpu_64
 CASABINDIR = bin64
 else
 CASABINDIR = bin
diff --git a/auth_token/PAM/linux/Makefile.am b/auth_token/PAM/linux/Makefile.am
index 4ec4776c..9e49456d 100644
--- a/auth_token/PAM/linux/Makefile.am
+++ b/auth_token/PAM/linux/Makefile.am
@@ -33,7 +33,7 @@ DIST_SUBDIRS =
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -59,7 +59,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lc -lpam -lcasa_auth_token
 LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT) -L$(CASALIBDIR)/$(TARGET_CFG)
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/auth_token/krb5_token/linux/Makefile.am b/auth_token/krb5_token/linux/Makefile.am
index be32886e..721e8d77 100644
--- a/auth_token/krb5_token/linux/Makefile.am
+++ b/auth_token/krb5_token/linux/Makefile.am
@@ -33,7 +33,7 @@ DIST_SUBDIRS =
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -64,7 +64,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lc -lgssapi
 LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/auth_token/linux/Makefile.am b/auth_token/linux/Makefile.am
index f55518e9..21ed605f 100644
--- a/auth_token/linux/Makefile.am
+++ b/auth_token/linux/Makefile.am
@@ -33,7 +33,7 @@ DIST_SUBDIRS =
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -59,7 +59,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lc -ldl
 LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_adlib/Makefile.am b/c_adlib/Makefile.am
index 078e96ba..89d39205 100644
--- a/c_adlib/Makefile.am
+++ b/c_adlib/Makefile.am
@@ -32,7 +32,7 @@ DIST_SUBDIRS = ad_kw ad_gk ad_ff
 
 CASAROOT = ..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -71,7 +71,7 @@ CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/ad_gk/$(TARGET_CFG) $(srcdir)
 	$(srcdir)/ad_ff/$(TARGET_CFG)
 
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_adlib/ad_ff/Makefile.am b/c_adlib/ad_ff/Makefile.am
index f5dbcac1..b8832609 100644
--- a/c_adlib/ad_ff/Makefile.am
+++ b/c_adlib/ad_ff/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -58,7 +58,7 @@ CS_RESOURCES =
 CS_LIBS = 
 CS_LIBPATH =  
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_adlib/ad_ff/native/Makefile.am b/c_adlib/ad_ff/native/Makefile.am
index b8fbce4b..587f1152 100644
--- a/c_adlib/ad_ff/native/Makefile.am
+++ b/c_adlib/ad_ff/native/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = $(CXXFILES)  *.h
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -72,13 +72,13 @@ LIBS = -lpthread -lc -ldl -L/opt/kde3/lib
 LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2  \
         -Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
 
-if X86
+if cpu_64
 EXTRA_LDFLAGS = -L/usr/lib64 -lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 
 else
 EXTRA_LddDFLAGS = -L/usr/lib -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib 
 endif
                                                                                                                             
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_adlib/ad_gk/Makefile.am b/c_adlib/ad_gk/Makefile.am
index c4f9f5ad..27a06fa5 100644
--- a/c_adlib/ad_gk/Makefile.am
+++ b/c_adlib/ad_gk/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -57,7 +57,7 @@ CS_RESOURCES =
 CS_LIBS = 
 CS_LIBPATH =  
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_adlib/ad_gk/native/Makefile.am b/c_adlib/ad_gk/native/Makefile.am
index fca5c250..76d6d85c 100644
--- a/c_adlib/ad_gk/native/Makefile.am
+++ b/c_adlib/ad_gk/native/Makefile.am
@@ -32,7 +32,7 @@ DIST_SUBDIRS =
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -51,7 +51,7 @@ MODULE_EXT = so
 
 CFILES = $(srcdir)/ad_gk.c 
 
-if X86
+if cpu_64
 LIBDIR = lib64
 else
 LIBDIR = lib
diff --git a/c_adlib/ad_kw/Makefile.am b/c_adlib/ad_kw/Makefile.am
index 91f7ed16..c9c68166 100644
--- a/c_adlib/ad_kw/Makefile.am
+++ b/c_adlib/ad_kw/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -59,7 +59,7 @@ CS_RESOURCES =
 CS_LIBS = 
 CS_LIBPATH =  
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_adlib/ad_kw/native/Makefile.am b/c_adlib/ad_kw/native/Makefile.am
index 43c7e18e..2a495e12 100644
--- a/c_adlib/ad_kw/native/Makefile.am
+++ b/c_adlib/ad_kw/native/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = $(CXXFILES) $(CXX_MOC_FILES) *.h
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -70,7 +70,7 @@ LIBS = -lpthread -lc -ldl -L/opt/kde3/lib
 LDFLAGS = -fno-exception -fno-check-new -Wl,-Bsymbolic -shared -pthread -O2  \
         -Wl,-rpath -Wl,/usr/lib -Wl,-soname -Wl,libkwallets_rw.so.1
 
-if X86
+if cpu_64
 EXTRA_LDFLAGS = -L/usr/lib64 -lpthread -lc -ldl -L/opt/kde3/lib64 -lkwalletclient \
 	-lqt-mt -L/usr/X11R6/lib64 -L/usr/lib/qt3/lib64 -lqt-mt 
 else
@@ -78,7 +78,7 @@ EXTRA_LDFLAGS = -L/usr/lib -lpthread -lc -ldl -L/opt/kde3/lib -lkwalletclient \
 	  -lqt-mt -L/usr/X11R6/lib -L/usr/lib/qt3/lib  -lqt-mt 
 endif
                                                                                                                             
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_common/linux/Makefile.am b/c_common/linux/Makefile.am
index 27e66ffd..b6f9842e 100644
--- a/c_common/linux/Makefile.am
+++ b/c_common/linux/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = $(CFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -58,7 +58,7 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lc -ldl
 LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_gui/Makefile.am b/c_gui/Makefile.am
index 90e90d89..37b24e59 100644
--- a/c_gui/Makefile.am
+++ b/c_gui/Makefile.am
@@ -40,13 +40,13 @@ EXTRA_DIST = $(CSFILES) *.sh CASAManager.* help/en/*.htm help/en/*.gif \
 
 CASAROOT = ..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64/$(TARGET_CFG)
 else
 CASALIBDIR = $(CASAROOT)/lib/$(TARGET_CFG)
 endif
 
-if X86
+if cpu_64
 CASABINDIR = $(CASAROOT)/bin64
 else
 CASABINDIR = $(CASAROOT)/bin
@@ -87,7 +87,7 @@ CS_LIBS =$(CASALIBDIR)/Novell.CASA.Common.dll \
 CS_LIBPATH = ../c_micasad/test/dependencies  \
 	$(CASALIBDIR) 
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_jwrapper/jnsscs/linux/Makefile.am b/c_jwrapper/jnsscs/linux/Makefile.am
index 28e19bcf..a95623e9 100644
--- a/c_jwrapper/jnsscs/linux/Makefile.am
+++ b/c_jwrapper/jnsscs/linux/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = *.exp
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -62,7 +62,7 @@ LIBS = -lpthread -lc -ldl
 LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=jmicasa_lux.exp -Wl,-rpath -Wl,/usr/lib \
 	 -L$(CASALIBDIR)/$(TARGET_CFG) -lmicasa -Wl,-soname -Wl,libjmicasa.so.1  
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_jwrapper/src/Makefile.am b/c_jwrapper/src/Makefile.am
index 9e8c363f..1b1ffcd3 100644
--- a/c_jwrapper/src/Makefile.am
+++ b/c_jwrapper/src/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST =$(JAVAFILES) com/novell/casa/*.java
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -66,7 +66,7 @@ CFLAGS += $(INCLUDES) $(DEFINES)
 LIBS = 
 LDFLAGS = 
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_micasacache/linux/Makefile.am b/c_micasacache/linux/Makefile.am
index 9de8aec1..afba2901 100644
--- a/c_micasacache/linux/Makefile.am
+++ b/c_micasacache/linux/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = $(CFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -60,7 +60,7 @@ CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) $(DEFINES)
 LIBS = -lpthread -lc -ldl
 LDFLAGS = -init _init -Bsymbolic -shared -soname=$(MODULE_NAME).$(MODULE_EXT)
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_micasad/Makefile.am b/c_micasad/Makefile.am
index b92537c3..cc460ee5 100644
--- a/c_micasad/Makefile.am
+++ b/c_micasad/Makefile.am
@@ -41,13 +41,13 @@ startup/micasad* startup/casacfgpam startup/casaucfgpam
 
 CASAROOT = ..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
 endif
 
-if X86
+if cpu_64
 CASABINDIR = $(CASAROOT)/bin64
 else
 CASABINDIR = $(CASAROOT)/bin
@@ -137,7 +137,7 @@ CS_LIBS =Mono.Posix.dll \
 
 CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) $(srcdir)/test/dependencies
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_micasad/lib/Makefile.am b/c_micasad/lib/Makefile.am
index 55486b46..3685538c 100644
--- a/c_micasad/lib/Makefile.am
+++ b/c_micasad/lib/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = $(CSFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -68,7 +68,7 @@ CS_RESOURCES =
 CS_LIBS = 
 CS_LIBPATH = 
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_micasadk/linux/Makefile.am b/c_micasadk/linux/Makefile.am
index a7f5dede..a84ba845 100644
--- a/c_micasadk/linux/Makefile.am
+++ b/c_micasadk/linux/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = *.exp
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 OBJDIR = $(TARGET_CFG)/lib64
 else
diff --git a/c_policy/Makefile.am b/c_policy/Makefile.am
index 25963ce0..2ad8c591 100644
--- a/c_policy/Makefile.am
+++ b/c_policy/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES)
 
 CASAROOT = ..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -64,7 +64,7 @@ CS_RESOURCES =
 CS_LIBS = 
 CS_LIBPATH =  
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/c_sharp/NSSCSWrapper/Makefile.am b/c_sharp/NSSCSWrapper/Makefile.am
index c405560a..3c37d661 100644
--- a/c_sharp/NSSCSWrapper/Makefile.am
+++ b/c_sharp/NSSCSWrapper/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = *.cs $(CSFILES)
 
 CASAROOT = ../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -63,7 +63,7 @@ CS_RESOURCES =
 CS_LIBS =$(CASALIBDIR)/$(TARGET_CFG)/Novell.CASA.Common.dll 
 CS_LIBPATH = $(CASALIBDIR)/$(TARGET_CFG) 
 
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib
diff --git a/configure.in b/configure.in
index d5c2796e..e9464b09 100644
--- a/configure.in
+++ b/configure.in
@@ -90,7 +90,7 @@ AC_SUBST(EMPTY)
 AC_SUBST(SPACE)
 
 #
-# Check for a valid operating system
+# Check for operating system and set TARGET_OS 
 #
 case $host_os in
     cygwin*)
@@ -105,21 +105,22 @@ AC_SUBST(TARGET_OS)
 AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux")
 AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
 
-
 #
-# Check for architecture
+# Check for architecture and set TARGET_ARCH
+# ia64 needs to be treated as non64.
+
 case $target_cpu in
-    *64*)
-        TARGET_ARCH='X86'
+    x86_64|p*pc64|s390x)
+        TARGET_ARCH='cpu_64'
     ;;
-    *)
-        TARGET_ARCH='I586'
+    ia64|*)
+        TARGET_ARCH='cpu_non64'
     ;;
 esac
 
 AC_SUBST(TARGET_ARCH)
-AM_CONDITIONAL(X86, test "$TARGET_ARCH" = "X86")
-AM_CONDITIONAL(I586, test "$TARGET_ARCH" = "I586")
+AM_CONDITIONAL(cpu_64, test "$TARGET_ARCH" = "cpu_64")
+AM_CONDITIONAL(cpu_non64, test "$TARGET_ARCH" = "cpu_non64")
 
 #
 #
diff --git a/login_capture/PAM/linux/Makefile.am b/login_capture/PAM/linux/Makefile.am
index 58b8af85..def722d9 100644
--- a/login_capture/PAM/linux/Makefile.am
+++ b/login_capture/PAM/linux/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = *.exp
 
 CASAROOT = ../../..
 
-if X86
+if cpu_64
 CASALIBDIR = $(CASAROOT)/lib64
 else
 CASALIBDIR = $(CASAROOT)/lib
@@ -62,7 +62,7 @@ LIBS =
 LDFLAGS = -Wl,-Bsymbolic -shared -Wl,--version-script=pam_micasa_lux.exp \
 	-Wl,-rpath -Wl,/usr/lib -L/usr/lib  -lpthread -lc -ldl \
 	-lpam -Wl,-soname -Wl,pam_micasa.so
-if X86
+if cpu_64
 OBJDIR = ./$(TARGET_CFG)/lib64
 else
 OBJDIR = ./$(TARGET_CFG)/lib