diff --git a/ChangeLog b/ChangeLog
index 12d4613e..74c4d34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-06  Moritz Schulte  <mo@g10code.com>
+
+	* configure.ac: Fix funopen replacement mechanism.
+
 2004-01-31  Marcus Brinkmann  <marcus@g10code.de>
 
 	* configure.ac: Add invocation of AC_SYS_LARGEFILE, AC_TYPE_OFF_T
diff --git a/configure.ac b/configure.ac
index c23c478d..393332bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,10 +281,11 @@ if test "$GPGSM" != "no"; then
   AC_CHECK_FUNCS(funopen)
   if test $ac_cv_func_funopen != yes; then
     # No funopen but we can implement that in terms of fopencookie.
-    AC_CHECK_FUNCS(fopencookie, AC_LIBOBJ(funopen),
-                   AC_MSG_ERROR([[
-No implementation of fopencookie or funopen available.
-]]))
+    if test $ac_cv_func_fopencookie = yes; then
+        AC_LIBOBJ([funopen])
+    else
+        AC_MSG_ERROR([No implementation of fopencookie or funopen available])
+    fi
   fi
 
   AC_REPLACE_FUNCS(isascii)