diff --git a/configure b/configure
index 9958438..efd3be5 100755
--- a/configure
+++ b/configure
@@ -1294,7 +1294,7 @@ fi
   ;;
   
   ## NetBSD and FreeBSD ( and maybe 386BSD also)
-  *-*-*bsd* )
+  *-*-*bsd*|*-*-darwin* )
     dir=bsd
     
   echo $ac_n "checking for ELF""... $ac_c" 1>&6
@@ -1375,8 +1375,8 @@ EOF
 
   ;;
   
-  ## NT - cygwin32
-  *-*-cygwin32* )
+  ## NT - cygwin
+  *-*-cygwin* )
     dir=cygwin32
   ;;
   
diff --git a/configure.in b/configure.in
index 8d490ed..964debe 100644
--- a/configure.in
+++ b/configure.in
@@ -322,8 +322,8 @@ case "$host" in
     AC_DEFINE(HAVE_NLIST)
   ;;
   
-  ## NT - cygwin32
-  *-*-cygwin32* )
+  ## NT - cygwin
+  *-*-cygwin* )
     dir=cygwin32
   ;;