diff --git a/ChangeLog b/ChangeLog
index 66ef297f1..4f6051393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-19  Werner Koch  <wk@gnupg.org>
+
+	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Support Cygwin target
+	* configure.ac [CYGWIN32]: Don't build tiger.  By Disastry.
+
 2001-12-18  Werner Koch  <wk@gnupg.org>
 
 	* Makefile.am (SUBDIRS): Add keyserver.
diff --git a/NEWS b/NEWS
index 5cbd76cfa..9d208e0b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+    * Some fixes to build cleanly under Cygwin32.
 
     * New tool gpgsplit to split OpenPGP data formats into packets.
 
diff --git a/THANKS b/THANKS
index 532d62b70..0fb9ca3a0 100644
--- a/THANKS
+++ b/THANKS
@@ -43,6 +43,7 @@ Detlef Lannert		   lannert@lannert.rz.uni-duesseldorf.de
 Dimitri 		   dmitri@advantrix.com
 Dirk Lattermann 	   dlatt@t-online.de
 Dirk Meyer                 dirk.meyer@dinoex.sub.org
+Disastry                   Disastry@saiknes.lv
 Ed Boraas		   ecxjo@esperanto.org
 Edmund GRIMLEY EVANS	   edmundo@rano.org
 Edwin Woudt                edwin@woudt.nl
diff --git a/acinclude.m4 b/acinclude.m4
index d7f2135f6..4a2c91672 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -661,7 +661,7 @@ AC_CHECK_TOOL(AS, as, false)
 AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
 [tmp_do_check="no"
 case "${target}" in
-    i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
+    i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp | *-*-cygwin)
         ac_cv_sys_symbol_underscore=yes
         ;;
     *)
diff --git a/configure.ac b/configure.ac
index 260cf6eba..227df838e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,9 @@ case "${target}" in
     *-*-mingw32*)
         disallowed_modules="rndunix rndlinux rndegd"
         ;;
+    *-*-cygwin*)
+        disallowed_modules="rndunix rndlinux rndegd tiger"
+        ;;
     *)
         disallowed_modules="rndw32"
        ;;
@@ -200,7 +203,7 @@ MPI_OPT_FLAGS=""
 
 try_gettext=yes
 case "${target}" in
-    *-*-mingw32*)
+    *-*-mingw32*|*-*-cygwin*)
         # special stuff for Windoze NT
         ac_cv_have_dev_random=no
         AC_DEFINE(USE_ONLY_8DOT3,1,
@@ -294,6 +297,9 @@ case "${target}" in
     *-*-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
+    *-*-cygwin*)
+        PRINTABLE_OS_NAME="Cygwin32"
+        ;;
     i?86-emx-os2 | i?86-*-os2*emx )
         PRINTABLE_OS_NAME="OS/2"
         ;;
@@ -608,7 +614,7 @@ if test "$use_static_rnd" = default; then
       static_random_module="rndlinux"
   else
       case "${target}" in
-          *-*-mingw32*)
+          *-*-mingw32*|*-*-cygwin*)
               static_random_module="rndw32"
               AC_DEFINE(USE_STATIC_RNDW32,1,
                        [At some point in the code we need to know that