diff --git a/ChangeLog b/ChangeLog
index b6476a96c6..4c65fd7686 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-23  Sven Neumann  <sven@gimp.org>
+
+	* INSTALL
+	* configure.in: added --without-wmf option to disable build of the
+	WMF plug-in.
+
 2008-09-23  Sven Neumann  <sven@gimp.org>
 
 	Move the "Use GEGL" check-box to the Colors menu (bug #548760):
diff --git a/INSTALL b/INSTALL
index 480ea680f7..5e95ca30bb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -157,11 +157,16 @@ These are:
      causing any trouble at compile-time, you can build --without-exif.
      Get libexif from http://www.sourceforge.net/projects/libexif.
 
-  --without-mng, --without-aa.  The MNG plug-in needs libmng and
-     configure checks for its presense. If for some reason you don't
-     want to build the MNG plug-in even though the library is installed,
-     use --without-mng to disable it expliticely. The same switch exists
-     for aalib, use --without-aa if you run into problems.
+  --without-aa.  The AA plug-in needs libaa and configure checks for
+     its presense. Use --without-aa if you run into problems.
+
+  --without-mng.  The MNG plug-in needs libmng and configure checks
+     for its presense. If for some reason you don't want to build the
+     MNG plug-in even though the library is installed, use
+     --without-mng to disable it explicitly.
+
+  --without-wmf.  The WMF plug-in needs libwmf2 and configure checks for
+     its presense. Use --without-aa if you run into problems.
 
   --without-webkit.  If for some reason you don't want to build the 
      helpbrowser plug-in, you can use --without-webkit to disable 
diff --git a/configure.in b/configure.in
index 112197c5b9..c407e27d51 100644
--- a/configure.in
+++ b/configure.in
@@ -1141,13 +1141,14 @@ AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = xyes)
 
 AC_ARG_WITH(libmng,  [  --without-libmng        build without MNG support])
 
-have_libmng=yes
+have_libmng=no
 if test "x$with_libmng" != xno && test -z "$MNG_LIBS" &&
    test -n "$PNG_LIBS" && test -n "$JPEG_LIBS" && test -n "$Z_LIBS"; then
   AC_CHECK_LIB(mng, mng_create,
     [AC_CHECK_HEADER(libmng.h, mng_ok=yes)],
     [have_libmng="no (MNG library not found)"], -lz -lm)
   if test "$mng_ok" = yes; then
+    have_libmng=yes
     FILE_MNG='file-mng$(EXEEXT)'; MNG_LIBS="-lmng $JPEG_LIBS $PNG_LIBS"
   else
     have_libmng="no (MNG header file not found)"
@@ -1398,22 +1399,26 @@ fi
 # Check for libwmf2
 ###################
 
+AC_ARG_WITH(wmf, [  --without-wmf           build without WMF support])
+
 have_libwmf=no
-AC_PATH_PROG(WMF_CONFIG, libwmf-config, no)
-if test "x$WMF_CONFIG" != "xno" ; then
-  have_libwmf=yes
-  AC_MSG_CHECKING(for libwmf >= wmf_required_version)
-  wmf_version=`$WMF_CONFIG --version`
-  if expr $wmf_version \>= wmf_required_version >/dev/null; then
-    AC_MSG_RESULT([yes (version $wmf_version)])
-    FILE_WMF='file-wmf$(EXEEXT)'
-    WMF_LIBS=`$WMF_CONFIG --libs`
-    WMF_CFLAGS=`$WMF_CONFIG --cflags`
+if test "x$with_wmf" != xno; then
+  AC_PATH_PROG(WMF_CONFIG, libwmf-config, no)
+  if test "x$WMF_CONFIG" != "xno" ; then
+    have_libwmf=yes
+    AC_MSG_CHECKING(for libwmf >= wmf_required_version)
+    wmf_version=`$WMF_CONFIG --version`
+    if expr $wmf_version \>= wmf_required_version >/dev/null; then
+      AC_MSG_RESULT([yes (version $wmf_version)])
+      FILE_WMF='file-wmf$(EXEEXT)'
+      WMF_LIBS=`$WMF_CONFIG --libs`
+      WMF_CFLAGS=`$WMF_CONFIG --cflags`
+    else
+      have_libwmf="no (libwmf is too old)"
+   fi
   else
-    have_libwmf="no (libwmf is too old)"
+    have_libwmf="no (libwmf not found)"
   fi
-else
-  have_libwmf="no (libwmf not found)"
 fi
 
 if test "x$have_libwmf" = xyes; then