diff --git a/configure.in b/configure.in
index 19b4d8af90..2c965ea469 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.192 $)
+AC_REVISION($Revision: 1.193 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1107,13 +1107,13 @@ AC_PATH_PROGS(JADE, openjade jade, jade)
 AC_SUBST(JADE)
 
 #
-# Look for SGML style sheets.  NetBSD has them under /usr/pkg/share 
+# Look for SGML files.  NetBSD has them under /usr/pkg/share 
 # (if installed), FreeBSD has them under /usr/local/share.
 #
 
 SGMLDIR=""
 
-AC_MSG_CHECKING(for SGML stylesheets)
+AC_MSG_CHECKING(for SGML files)
 for d in /usr/pkg/share/sgml /usr/local/share/sgml 
 do
 	if test -f $d/docbook/dsssl/modular/html/docbook.dsl
@@ -1132,6 +1132,31 @@ fi
 
 AC_SUBST(SGMLDIR)
 
+#
+# Look for XML files.
+#
+
+XGMLDIR=""
+
+AC_MSG_CHECKING(for XML files)
+for d in /usr/pkg/share/xml /usr/local/share/xml
+do
+	if test -f $d/dtd/docbook/docbookx.dtd
+	then
+		XMLDIR=$d
+		AC_MSG_RESULT(in $XMLDIR)
+		break
+	fi
+done
+
+if test "X$XMLDIR" = "X"
+then
+	AC_MSG_RESULT("not found");
+	XMLDIR=/usr/local/share/xml
+fi
+
+AC_SUBST(XMLDIR)
+
 #
 # Substitutions
 #
diff --git a/doc/arm/catalog.in b/doc/arm/catalog.in
index 59285c8a9a..e39b0ca1f4 100644
--- a/doc/arm/catalog.in
+++ b/doc/arm/catalog.in
@@ -3,4 +3,4 @@ CATALOG "@SGMLDIR@/docbook/2.4.1/catalog"
 CATALOG "@SGMLDIR@/docbook/3.0/catalog"
 CATALOG "@SGMLDIR@/docbook/3.1/catalog"
 CATALOG "@SGMLDIR@/jade/catalog"
-CATALOG "/usr/local/share/xml/catalog"
+CATALOG "@XMLDIR@/catalog"