diff --git a/configure.in b/configure.in
index b79a785..47e5f02 100644
--- a/configure.in
+++ b/configure.in
@@ -75,7 +75,7 @@ AC_DEFINE_UNQUOTED(UTMP_IDENT, "`grep '$''Id:' $srcdir/src/utmp.c | sed 's/^.*\$
 AC_DEFINE_UNQUOTED(WINDOWS_IDENT, "`grep '$''Id:' $srcdir/src/windows.c | sed 's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [windows.c RCS ID])
 
 dnl# Check for build/host/target system types
-AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 
 dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
 if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
@@ -506,7 +506,7 @@ HAVE_MMX_64=""
 AC_ARG_ENABLE(mmx, [  --enable-mmx            enable MMX assembly routines], [
                   test "x$enableval" = "xyes" && HAVE_MMX="yes"
               ], [
-                  case $target_cpu in
+                  case $host_cpu in
                       i*86)
                           grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
                           ;;
@@ -1050,9 +1050,9 @@ Configuration:
   Source code location:       $srcdir
   Host System Type:           $host
   Preprocessor:               $CPP $CPPFLAGS
-  Compiler:	              $CC $CFLAGS
+  Compiler:                   $CC $CFLAGS
   Linker:                     $CC $LDFLAGS $LIBS
-  Install path:		      $prefix
+  Install path:               $prefix
 
   See src/feature.h for further configuration information.