diff --git a/configure b/configure
index bea7eac..d6b6af3 100755
--- a/configure
+++ b/configure
@@ -1389,7 +1389,7 @@ Optional Packages:
   --with-dsoflags=...     Specify additional DSOFLAGS
   --with-ldflags=...      Specify additional LDFLAGS
   --with-docdir           set directory for documentation,
-                          default=${prefix}/share/doc/mxml
+                          default=${prefix}/share/doc/mxml4
 
 Some influential environment variables:
   CC          C compiler command
@@ -4661,7 +4661,16 @@ then :
 
 else $as_nop
 
-    docdir="NONE"
+    if test x$enable_libmxml4_prefix != xno
+then :
+
+	docdir="\${prefix}/share/doc/mxml4"
+
+else $as_nop
+
+	docdir="\${prefix}/share/doc/mxml"
+
+fi
 
 fi
 
diff --git a/configure.ac b/configure.ac
index 20b302a..52273da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,12 +324,16 @@ AC_ARG_WITH([ldflags], AS_HELP_STRING([--with-ldflags=...], [Specify additional
 
 
 dnl Directories...
-AC_ARG_WITH([docdir], AS_HELP_STRING([--with-docdir], [set directory for documentation, default=${prefix}/share/doc/mxml]), [
+AC_ARG_WITH([docdir], AS_HELP_STRING([--with-docdir], [set directory for documentation, default=${prefix}/share/doc/mxml4]), [
     docdir="$withval"
 ], [
-    docdir="NONE"
+    AS_IF([test x$enable_libmxml4_prefix != xno], [
+	docdir="\${prefix}/share/doc/mxml4"
+    ], [
+	docdir="\${prefix}/share/doc/mxml"
+    ])
 ])
-AC_SUBST(docdir)
+AC_SUBST([docdir])
 
 AS_IF([test "$prefix" = NONE], [
     # Default prefix isn't bound until AC_OUTPUT...