diff --git a/src/configure b/src/configure
index 724226ebcd..e620511d8c 100755
--- a/src/configure
+++ b/src/configure
@@ -641,10 +641,10 @@ starts 'checking host system type...'
 **************************************************************
 EOT
 	TEMPLATE=generic
-	GUESS=`grep "$host_os" template/.similar 2>/dev/null`
+	GUESS=`grep "$host" template/.similar 2>/dev/null`
 	if test ! "$GUESS"
-	then	host_os_no_ver=`echo "$host_os" | sed 's/[0-9.]*$//'`
-		GUESS=`grep "$host_os_no_ver" template/.similar 2>/dev/null`
+	then	host_no_ver=`echo "$host" | sed 's/[0-9.]*$//'`
+		GUESS=`grep "$host_no_ver" template/.similar 2>/dev/null`
 	fi
 	if test "$GUESS"
 	then
diff --git a/src/configure.in b/src/configure.in
index 5b279e8669..c0fa45786d 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -79,10 +79,10 @@ starts 'checking host system type...'
 **************************************************************
 EOT
 	TEMPLATE=generic
-	GUESS=`grep "$host_os" template/.similar 2>/dev/null`
+	GUESS=`grep "$host" template/.similar 2>/dev/null`
 	if test ! "$GUESS"
-	then	host_os_no_ver=`echo "$host_os" | sed 's/[[0-9.]]*$//'`
-		GUESS=`grep "$host_os_no_ver" template/.similar 2>/dev/null`
+	then	host_no_ver=`echo "$host" | sed 's/[[0-9.]]*$//'`
+		GUESS=`grep "$host_no_ver" template/.similar 2>/dev/null`
 	fi
 	if test "$GUESS"
 	then