diff --git a/configure.in b/configure.in
index 919a11d7..d5c2796e 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@
 
 AC_INIT(auth_token/linux/auth_token.c)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(CASA, 1.6.399)
+AM_INIT_AUTOMAKE(CASA, 1.6.408)
 RELEASE=`date +%Y%m%d_%H%M`
 AC_SUBST(RELEASE)
 AM_MAINTAINER_MODE
@@ -93,16 +93,14 @@ AC_SUBST(SPACE)
 # Check for a valid operating system
 #
 case $host_os in
-    linux*)
-        TARGET_OS='linux'
-    ;;
     cygwin*)
         TARGET_OS='windows'
     ;;
     *)
-        AC_MSG_ERROR([Unknown host_os: $host_os])
+	TARGET_OS='linux'
     ;;
 esac
+
 AC_SUBST(TARGET_OS)
 AM_CONDITIONAL(LINUX, test "$TARGET_OS" = "linux")
 AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
@@ -111,14 +109,11 @@ AM_CONDITIONAL(WINDOWS, test "$TARGET_OS" = "windows")
 #
 # Check for architecture
 case $target_cpu in
-    x86_64*)
+    *64*)
         TARGET_ARCH='X86'
     ;;
-    i*86)
-        TARGET_ARCH='I586'
-    ;;
     *)
-        AC_MSG_ERROR([Unknown host_os: $target_cpu])
+        TARGET_ARCH='I586'
     ;;
 esac