diff --git a/c_adlib/ad_kw/native/Makefile.am b/c_adlib/ad_kw/native/Makefile.am
index 2a495e12..83bc76b1 100644
--- a/c_adlib/ad_kw/native/Makefile.am
+++ b/c_adlib/ad_kw/native/Makefile.am
@@ -63,7 +63,7 @@ INCLUDES =  -I. -I.. -I$(CASAROOT)/include \
 -I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -I/opt/gnome/include/gnome-keyring-1/ 
 CXXFLAGS = $(CPP_LIBFLAG) $(INCLUDES) 
 EXTRA_CXXFLAGS = -fPIC -DPIC -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NANESPACE \ 
-   -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g -D_REENTRANT \
+   -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g -D_REENTRANT \
    -DALIGNMENT -DN_PLAT_UNIX -DUNIX -DLINUX -DIAPX386 
 CXX_RESOURCES =
 LIBS = -lpthread -lc -ldl -L/opt/kde3/lib  
diff --git a/configure.in b/configure.in
index e9464b09..2159133f 100644
--- a/configure.in
+++ b/configure.in
@@ -113,7 +113,7 @@ case $target_cpu in
     x86_64|p*pc64|s390x)
         TARGET_ARCH='cpu_64'
     ;;
-    ia64|*)
+    *ia64|*)
         TARGET_ARCH='cpu_non64'
     ;;
 esac
@@ -184,7 +184,7 @@ then
  # CFLAGS="$CFLAGS_DEBUG $CFLAGS -DDBG -DDEBUG"
   CFLAGS="$CFLAGS_DEBUG $CFLAGS -g -DDBG -DDEBUG \
 -fPIC -DPIC -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \
--fstack-protector -D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \
+-D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \
 -DUNIX -DLINUX -DIAPX38"
   CSCFLAGS="$CSCFLAGS_DEBUG $CSCFLAGS"
   CXXFLAGS="$CXXFLAGS_DEBUG $CXXFLAGS"
@@ -194,7 +194,7 @@ else
   # Build optimized version.
   CFLAGS="$CFLAGS_OPTIMIZE $CFLAGS -g -fPIC -DPIC \
 -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall \
--fstack-protector -D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \
+-D_REENTRANT -DALIGNMENT -DN_PLAT_UNIX \
 -DUNIX -DLINUX -DIAPX38"
   CSCFLAGS="$CSCFLAGS_OPTIMIZE $CSCFLAGS"
   CXXFLAGS="$CXXFLAGS_OPTIMIZE $CXXFLAGS"
diff --git a/package/linux/CASA.spec.in b/package/linux/CASA.spec.in
index e25f468e..7803b035 100644
--- a/package/linux/CASA.spec.in
+++ b/package/linux/CASA.spec.in
@@ -10,11 +10,7 @@
 
 # norootforbuild
 
-## for debug, uncomment the following lines
-# %define cfg Debug
-# %define debug_opt --enable-debug
-
-# For debug build, please commnent out the following lines
+# For debug build, please replace Release to Debug and set debug_opt to --enable-debug
 %define cfg Release
 %define debug_opt ""