diff --git a/bin/osversion b/bin/osversion
index 4fea81c..edb4add 100755
--- a/bin/osversion
+++ b/bin/osversion
@@ -1,22 +1,14 @@
 #!/bin/sh
-
-
-# Location of the add-dir-to-var program
 os=`./config.guess`
-
-# o/s switch block
 case "$os" in
         sparc-sun-sunos*)	echo sunos4 ;;
         sparc-sun-solaris1*)	echo sunos4 ;;
-        sparc-sun-solaris2*)	echo sunos5 ;;
-        alpha-dec-osf1)	      echo osf1 ;;
-	i386-*-solaris*)      echo sunos5 ;;
+        *-*-solaris2*)	        echo sunos5 ;;
+        alpha-dec-osf1)		echo osf1 ;;
 	*-apple-darwin*)	echo darwin ;;
-        *-*-linux*)	      echo linux ;;
-        *-*-openbsd*)         echo openbsd ;;
-        *-*-freebsd*)         echo freebsd ;;
+        *-*-linux*)		echo linux ;;
+        *-*-openbsd*)		echo openbsd ;;
+        *-*-freebsd*)		echo freebsd ;;
 esac
-
-
-### Don't leave the variables set.
+### Don't leave the variable set.
 unset os