diff --git a/clamav-devel/ChangeLog b/clamav-devel/ChangeLog
index 2dfb73332..5ea738f82 100644
--- a/clamav-devel/ChangeLog
+++ b/clamav-devel/ChangeLog
@@ -1,3 +1,14 @@
+Wed Feb 18 04:09:56 CET 2004 (tk)
+---------------------------------
+  * clamd: temporarily disabled strerror_r (due to a compilation problem on
+	   Solaris reported by Nigel)
+
+Tue Feb 17 23:43:22 CET 2004 (tk)
+---------------------------------
+  * configure: fixed in_port_t detection on OpenBSD (problem reported by Nigel)
+  * clamdscan: fixed problem with /cygdrive/ on Cygwin (thanks to Andrey
+	       Cherezov <andrey*cherezov.koenig.su>)
+
 Tue Feb 17 20:49:23 GMT 2004 (njh)
 ----------------------------------
   * libclamav: Added a new bounce delimeter
diff --git a/clamav-devel/aclocal.m4 b/clamav-devel/aclocal.m4
index 52bc1db1e..574330ffc 100644
--- a/clamav-devel/aclocal.m4
+++ b/clamav-devel/aclocal.m4
@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for
 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created
 dnl (the prefix is a bit different, since we add an extra -target- and -host-)
 dnl 
-dnl @version: $Id: aclocal.m4,v 1.19 2004/02/14 09:32:34 kojm Exp $
+dnl @version: $Id: aclocal.m4,v 1.20 2004/02/18 03:15:05 kojm Exp $
 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often
 
 AC_DEFUN([AC_CREATE_TARGET_H],
@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)
 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)
 dnl
 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>
-dnl @version $Id: aclocal.m4,v 1.19 2004/02/14 09:32:34 kojm Exp $
+dnl @version $Id: aclocal.m4,v 1.20 2004/02/18 03:15:05 kojm Exp $
 dnl
 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],
 [changequote(<<, >>)dnl
diff --git a/clamav-devel/clamd/server-th.c b/clamav-devel/clamd/server-th.c
index f0872cb4c..d44bad05c 100644
--- a/clamav-devel/clamd/server-th.c
+++ b/clamav-devel/clamd/server-th.c
@@ -380,7 +380,8 @@ int acceptloop_th(int socketd, struct cl_node *root, const struct cfgstruct *cop
     for(;;) {				
 	new_sd = accept(socketd, NULL, NULL);
 	if((new_sd == -1) && (errno != EINTR)) {
-	    logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE));
+	    logg("!accept() failed\n");
+	    /* logg("!accept() failed: %s", strerror_r(errno, buff, BUFFSIZE)); */
 	    /* very bad - need to exit or restart */
 	    continue;
 	}
diff --git a/clamav-devel/clamdscan/client.c b/clamav-devel/clamdscan/client.c
index 7684b4a19..a3a5c2a99 100644
--- a/clamav-devel/clamdscan/client.c
+++ b/clamav-devel/clamdscan/client.c
@@ -216,7 +216,11 @@ int client(const struct optstruct *opt)
 	    return 2;
 	} else {
 	    file = mcalloc(200 + strlen(opt->filename) + 10, sizeof(char));
+#ifdef C_CYGWIN
+	    sprintf(file, "%s", opt->filename);
+#else
 	    sprintf(file, "%s/%s", cwd, opt->filename);
+#endif
 	}
     }
 
diff --git a/clamav-devel/configure b/clamav-devel/configure
index 550d6f28c..c1066051d 100755
--- a/clamav-devel/configure
+++ b/clamav-devel/configure
@@ -9565,6 +9565,7 @@ else
 #line $LINENO "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
+#include <sys/types.h>
 int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }
 _ACEOF
 rm -f conftest$ac_exeext
diff --git a/clamav-devel/configure.in b/clamav-devel/configure.in
index 72ef2894c..04bbdab50 100644
--- a/clamav-devel/configure.in
+++ b/clamav-devel/configure.in
@@ -235,6 +235,7 @@ fi
 
 # check for in_port_t definition
 AC_TRY_RUN([#include <netinet/in.h>
+#include <sys/types.h>
 int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }],
 AC_DEFINE(HAVE_IN_PORT_T,1,[in_port_t is defined]), AC_MSG_RESULT(in_port_t is not defined))