diff --git a/README b/README
index 821a255116..287b698fe0 100644
--- a/README
+++ b/README
@@ -38,7 +38,7 @@ A. Creating the proper directory structure.
       i386_linux22, i386_linux24, i386_linux26
       i386_umlinux22, i386_umlinux24
       i386_obsd31, i386_obsd32, i386_obsd33, i386_obsd34, i386_obsd35,
-         i386_obsd36
+         i386_obsd36, i386_obsd37, i386_obsd38
       rs_aix42
       sgi_65 (file server not tested)
       sun4_413 (No client support, no fileserver support, db servers only)
diff --git a/acinclude.m4 b/acinclude.m4
index 1b6639c43f..3bcfe69eec 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -233,29 +233,11 @@ if test "x$with_afs_sysname" != "x"; then
 else
 	AC_MSG_CHECKING(your AFS sysname)
 	case $host in
-		i?86-*-openbsd3.1)
-			AFS_SYSNAME="i386_obsd31"
-			;;
-		i?86-*-openbsd3.2)
-			AFS_SYSNAME="i386_obsd32"
-			;;
-		i?86-*-openbsd3.3)
-			AFS_SYSNAME="i386_obsd33"
-			;;
-		i?86-*-openbsd3.4)
-			AFS_SYSNAME="i386_obsd34"
-			;;
-		i?86-*-openbsd3.5)
-			AFS_SYSNAME="i386_obsd35"
-			;;
-		i?86-*-openbsd3.6)
-			AFS_SYSNAME="i386_obsd36"
-			;;
-		i?86-*-openbsd3.7)
-			AFS_SYSNAME="i386_obsd37"
-			;;
-		i?86-*-openbsd3.8)
-			AFS_SYSNAME="i386_obsd38"
+		i?86-*-openbsd?.?)
+			v=${host#*openbsd}
+			vM=${v%.*}
+			vm=${v#*.}
+			AFS_SYSNAME="i386_obsd${vM}${vm}"
 			;;
 		i?86-*-freebsd4.2*)
 			AFS_SYSNAME="i386_fbsd_42"