diff --git a/ChangeLog b/ChangeLog
index d10f4e49c..f5f10cf5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31  Miguel de Icaza  <miguel@ximian.com>
+
+	* configure.in: If monodoc is not found, then turn off
+	enable_monodoc, so the value is properly propagated.
+
 2004-03-31  Mike Kestner  <mkestner@ximian.com>
 
 	* configure.in : remove atk/glue/Makefile
diff --git a/configure.in b/configure.in
index c827a12d0..b367a4529 100644
--- a/configure.in
+++ b/configure.in
@@ -88,6 +88,9 @@ PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, enab
 
 if test "x$enable_monodoc" = "xyes"; then
 	AC_PATH_PROG(MONODOC, monodoc, no)
+	if x$MONODOC = xno; then
+	   enable_monodoc=no
+	fi
 else
 	MONODOC=
 fi