diff --git a/Makefile b/Makefile
index 42c5883fc0e795818be91894b27a75a8f067d455..da2cc13b90b076b9a2eb4585de8ed3d3a9efc0a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.444 2007-11-27 22:37:00 geuzaine Exp $
+# $Id: Makefile,v 1.445 2007-11-28 09:26:01 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -121,10 +121,10 @@ tag:
 	echo "#define GMSH_PATCH_VERSION ${GMSH_PATCH_VERSION}" >> ${GMSH_VERSION_FILE}
 	echo "#define GMSH_EXTRA_VERSION \"${GMSH_EXTRA_VERSION}\"" >> ${GMSH_VERSION_FILE}
 	echo "#define GMSH_VERSION  \"${GMSH_VERSION}\"" >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_DATE     \"`date`\""     >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_HOST     \"`hostname`\"" >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_PACKAGER \"`whoami`\""   >> ${GMSH_VERSION_FILE}
-	echo "#define GMSH_OS       \"${UNAME}\""   >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_DATE     \"`date`\""          >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_HOST     \"${HOSTNAME}\""     >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_PACKAGER \"`whoami`\""        >> ${GMSH_VERSION_FILE}
+	echo "#define GMSH_OS       \"${UNAME}\""        >> ${GMSH_VERSION_FILE}
 	echo "#define GMSH_SHORT_LICENSE \"${GMSH_SHORT_LICENSE}\"" >> ${GMSH_VERSION_FILE}
 
 initialtag:
diff --git a/configure b/configure
index ee3475124b8bddbfbe518c0b64ddd1aebdba0e7e..22a11b89b8400be2db8516414479c24e7b368c31 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB AR FLTKCONFIG F77 FFLAGS ac_ct_F77 CXXCPP EGREP UNAME FLAGS OPTIM LINKER GMSH_DIRS GMSH_LIBS POSTBUILD LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB AR FLTKCONFIG F77 FFLAGS ac_ct_F77 CXXCPP EGREP UNAME HOSTNAME FLAGS OPTIM LINKER GMSH_DIRS GMSH_LIBS POSTBUILD LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1539,6 +1539,7 @@ fi;
 
 
 UNAME=`uname`
+HOSTNAME=`hostname`
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -4820,7 +4821,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:4823:" \
+echo "$as_me:4824:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6406,6 +6407,7 @@ fi
 
 
 
+
           ac_config_files="$ac_config_files variables"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7062,6 +7064,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@UNAME@,$UNAME,;t t
+s,@HOSTNAME@,$HOSTNAME,;t t
 s,@FLAGS@,$FLAGS,;t t
 s,@OPTIM@,$OPTIM,;t t
 s,@LINKER@,$LINKER,;t t
@@ -7336,7 +7339,7 @@ fi
 
 echo "********************************************************************"
 echo "Gmsh is configured for"
-echo "- OS           : $UNAME"
+echo "- OS           : $UNAME on $HOSTNAME"
 echo "- C compiler   : $CC"
 echo "- C++ compiler : $CXX"
 echo "- Linker       : $LINKER"
diff --git a/configure.in b/configure.in
index eafa1ac3d01691b0721e6791841f4ba875bcd766..d3f46c97feffcec51fd31125ff1865ce5f076951 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.137 2007-11-26 13:35:32 geuzaine Exp $
+dnl $Id: configure.in,v 1.138 2007-11-28 09:26:01 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 dnl
@@ -145,8 +145,9 @@ AC_ARG_ENABLE(universal,
                              [enable support for universal binaries on Mac (default=no)]))
 
 
-dnl Get the operating system name
+dnl Get the operating system and machine names
 UNAME=`uname`
+HOSTNAME=`hostname`
 
 dnl Check for default compilers
 AC_PROG_CC
@@ -814,6 +815,7 @@ fi
 
 dnl Write output
 AC_SUBST(UNAME)
+AC_SUBST(HOSTNAME)
 AC_SUBST(FLAGS)
 AC_SUBST(OPTIM)
 AC_SUBST(LINKER)
@@ -826,7 +828,7 @@ AC_OUTPUT(variables)
 dnl Print some information
 echo "********************************************************************"
 echo "Gmsh is configured for"
-echo "- OS           : $UNAME"
+echo "- OS           : $UNAME on $HOSTNAME"
 echo "- C compiler   : $CC"
 echo "- C++ compiler : $CXX"
 echo "- Linker       : $LINKER"
diff --git a/variables.in b/variables.in
index 7cc0778fd789fbfecf988294a567f27af4d7e459..fdd32fe91d7dc39bfdc872c299d1a37c80597eda 100644
--- a/variables.in
+++ b/variables.in
@@ -1,4 +1,4 @@
-# $Id: variables.in,v 1.18 2007-11-26 13:11:50 geuzaine Exp $
+# $Id: variables.in,v 1.19 2007-11-28 09:26:01 geuzaine Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -19,8 +19,9 @@
 # 
 # Please report all bugs and problems to <gmsh@geuz.org>.
 
-# OS
+# OS and host
 UNAME=@UNAME@
+HOSTNAME=@HOSTNAME@
 
 # The names of the C and C++ compilers
 CC=@CC@