diff --git a/Makefile b/Makefile
index f046e2fd07b4a2507b49186b4c42b3ca235ce2b4..0886f105ab0adf10432330f70926d8d20bde7488 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.394 2005-07-03 08:02:23 geuzaine Exp $
+# $Id: Makefile,v 1.395 2005-08-31 22:03:26 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -112,10 +112,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 -sr`\"" >> ${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.in b/configure.in
index ce85e6e22102c251ea5b73f78ef505d1c6aa4f94..fd75e21f05cead4421b6a8947402a9c6ce97e09f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.76 2005-08-31 21:44:44 geuzaine Exp $
+dnl $Id: configure.in,v 1.77 2005-08-31 22:03:26 geuzaine Exp $
 dnl
 dnl Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 dnl
@@ -88,7 +88,7 @@ AC_ARG_ENABLE(png,
               AC_HELP_STRING([--enable-png],
                              [enable PNG support (default=yes)]))
 
-dnl Get the operating system and version number
+dnl Get the operating system name
 UNAME=`uname`
 
 dnl Check for default compilers