diff -urN -x .build -x .inst -x .sinst -x autom4te.cache mhash-0.9.2-orig/CYGWIN-PATCHES/README mhash-0.9.2/CYGWIN-PATCHES/README
--- mhash-0.9.2-orig/CYGWIN-PATCHES/README	2005-01-12 16:54:24.000000000 +0000
+++ mhash-0.9.2/CYGWIN-PATCHES/README	2005-05-28 09:19:23.937500000 +0000
@@ -1,4 +1,4 @@
-mhash-0.9.1-1
+mhash-0.9.2-1
 ------------------------------------------ 
 MHash - library of hash algorithms
 
@@ -50,21 +50,29 @@
   /usr/lib/libmhash.a
   /usr/lib/libmhash.dll.a
   /usr/lib/libmhash.la
-  /usr/share/doc/Cygwin/mhash-0.9.1.README (this file)
-  /usr/share/doc/mhash-0.9.1/AUTHORS
-  /usr/share/doc/mhash-0.9.1/ChangeLog
-  /usr/share/doc/mhash-0.9.1/COPYING
-  /usr/share/doc/mhash-0.9.1/INSTALL
-  /usr/share/doc/mhash-0.9.1/NEWS
-  /usr/share/doc/mhash-0.9.1/README
-  /usr/share/doc/mhash-0.9.1/THANKS
-  /usr/share/doc/mhash-0.9.1/TODO
+  /usr/share/doc/Cygwin/mhash-0.9.2.README (this file)
+  /usr/share/doc/md5-rfc1321.txt
+  /usr/share/doc/skid2-authentication 
+  /usr/share/doc/mhash-0.9.2/AUTHORS
+  /usr/share/doc/mhash-0.9.2/ChangeLog
+  /usr/share/doc/mhash-0.9.2/COPYING
+  /usr/share/doc/mhash-0.9.2/INSTALL
+  /usr/share/doc/mhash-0.9.2/NEWS
+  /usr/share/doc/mhash-0.9.2/README
+  /usr/share/doc/mhash-0.9.2/THANKS
+  /usr/share/doc/mhash-0.9.2/TODO
   /usr/share/man/man3/mhash.3.gz
 
 -------------------------------------------------------------------------------
 
 Port Notes:
 
+----- version mhash-0.9.2-1 -----
+
+All cygwin patches applied upstream. 
+Minor build script improvements.
+Reverted the dll main hack.
+
 ----- version mhash-0.9.1-1 -----
 
 Maintainer change. Fixed to be mingw independent. All tests PASS.
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache mhash-0.9.2-orig/configure.in mhash-0.9.2/configure.in
--- mhash-0.9.2-orig/configure.in	2005-01-12 18:24:03.000000000 +0000
+++ mhash-0.9.2/configure.in	2005-05-28 09:44:15.218750000 +0000
@@ -143,7 +143,7 @@
 dnl AC_DISABLE_STATIC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
-AM_SET_LIBTOOL_VARIABLE([--silent])
+AM_SET_LIBTOOL_VARIABLE([--silent -no-undefined])
 
 AC_CONFIG_FILES([Makefile mhash.spec doc/Makefile src/Makefile lib/Makefile])
 AC_OUTPUT
diff -urN -x .build -x .inst -x .sinst -x autom4te.cache mhash-0.9.2-orig/lib/mhash.c mhash-0.9.2/lib/mhash.c
--- mhash-0.9.2-orig/lib/mhash.c	2005-01-12 20:58:53.000000000 +0000
+++ mhash-0.9.2/lib/mhash.c	2005-05-27 18:44:12.000000000 +0000
@@ -734,7 +734,7 @@
 		return MHASH_FAILED;
 }
 
-#if defined(WIN32) || defined (__CYGWIN__)
+#if defined(WIN32) && !defined (__CYGWIN__)
 WIN32DLL_DEFINE int main (void)
 {
        /* empty main function to avoid linker error (see cygwin FAQ) */