diff --git a/ChangeLog b/ChangeLog
index 4c2f61c4..0fe07964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-04  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* configure.in: Also check whether #include <md5.h> works before
+	deciding to use Solaris libmd5.
+
 2003-11-03  Hrvoje Niksic  <hniksic@xemacs.org>
 
 	* configure.in: Look for nanosleep in -lrt and -lposix4, which is
diff --git a/configure.in b/configure.in
index fa641009..21a4cebb 100644
--- a/configure.in
+++ b/configure.in
@@ -438,9 +438,14 @@ then
   dnl specific to the Solaris MD5 library.
   if test x"$found_md5" = xno; then
     AC_CHECK_LIB(md5, md5_calc, [
-      AC_DEFINE(HAVE_SOLARIS_MD5)
-      LIBS="-lmd5 $LIBS"
-      found_md5=yes
+      dnl There are programs that insert bogus <md5.h> in the include
+      dnl path.  That makes the system md5 library is useless to us.
+      AC_TRY_CPP([#include <md5.h>
+                 ], [
+        AC_DEFINE(HAVE_SOLARIS_MD5)
+        LIBS="-lmd5 $LIBS"
+        found_md5=yes
+      ])
     ])
   fi