diff --git a/config.h.in b/config.h.in
index f719f02bc5..6a50ea6361 100644
--- a/config.h.in
+++ b/config.h.in
@@ -187,7 +187,7 @@
 #undef HAVE_WAIT3
 
 /* Host for this compilation */
-#undef HOST
+#undef HOSTTYPE
 
 /* Major part of version number */
 #undef MAJOR_VERSION
diff --git a/configure b/configure
index 0d134968c7..2180c36d48 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.8 .
+# From configure.ac Revision: 1.9 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57 for BOINC 1.03.
 #
@@ -1841,7 +1841,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define HOST "$host"
+#define HOSTTYPE "$host"
 _ACEOF
 
 
@@ -2643,13 +2643,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   ''\
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   '#include <stdlib.h>'
+   'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
@@ -2658,8 +2657,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -3121,13 +3120,12 @@ else
   fi
 fi
 for ac_declaration in \
-   ''\
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
    'extern "C" void exit (int);' \
-   'void exit (int);' \
-   '#include <stdlib.h>'
+   'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
@@ -3136,8 +3134,8 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {