diff --git a/configure b/configure
index 3eff88131a..2a454e8f11 100755
--- a/configure
+++ b/configure
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# From configure.in Revision
+# From configure.in Revision: 1.246 
 
 ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
 ## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
@@ -5201,39 +5201,50 @@ done
 
 
 #
-# Look for SGML files.  NetBSD has them under /usr/pkg/share 
-# (if installed), FreeBSD has them under /usr/local/share.
+# Look for SGML files.  The location varies; so far we
+# have seen:
+#
+# 	NetBSD 	/usr/pkg/share/docbook/dsssl/modular/
+# 	FreeBSD	/usr/local/share/docbook/dsssl/modular/
+#	Linux	/usr/local/share/dsssl/docbook/
 #
 
 SGMLDIR=""
+SGMLSTYLEDIR=""
 
 echo $ac_n "checking for SGML files""... $ac_c" 1>&6
-echo "configure:5212: checking for SGML files" >&5
+echo "configure:5217: checking for SGML files" >&5
 for d in /usr/pkg/share/sgml /usr/local/share/sgml 
 do
-	if test -f $d/docbook/dsssl/modular/html/docbook.dsl
-	then
-		SGMLDIR=$d
-		echo "$ac_t""in $SGMLDIR" 1>&6
-		break
-	fi
+	for s in docbook/dsssl/modular dsssl/docbook
+	do
+		if test -f $d/$s/html/docbook.dsl
+		then
+			SGMLDIR=$d
+			SGMLSTYLEDIR=$d/$s
+			echo "$ac_t""in $SGMLSTYLEDIR" 1>&6
+			break
+		fi
+	done
 done
 
 if test "X$SGMLDIR" = "X"
 then
 	echo "$ac_t"""not found"" 1>&6;
 	SGMLDIR=/usr/local/share/sgml
+	SGMLSTYLEDIR=/usr/local/share/docbook/dsssl/modular
 fi
 
 
 
+
 #
 # Look for XML files.
 #
 XGMLDIR=""
 
 echo $ac_n "checking for XML files""... $ac_c" 1>&6
-echo "configure:5237: checking for XML files" >&5
+echo "configure:5248: checking for XML files" >&5
 for d in /usr/pkg/share/xml /usr/local/share/xml
 do
 	if test -f $d/dtd/docbook/docbookx.dtd
@@ -5608,6 +5619,7 @@ s%@JADE@%$JADE%g
 s%@TEX@%$TEX%g
 s%@PDFTEX@%$PDFTEX%g
 s%@SGMLDIR@%$SGMLDIR%g
+s%@SGMLSTYLEDIR@%$SGMLSTYLEDIR%g
 s%@XMLDIR@%$XMLDIR%g
 s%@BIND9_TOP_BUILDDIR@%$BIND9_TOP_BUILDDIR%g
 s%@BIND9_ISC_BUILDINCLUDE@%$BIND9_ISC_BUILDINCLUDE%g
diff --git a/configure.in b/configure.in
index 05b43f1bee..3c4b8c5b01 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.245 $)
+AC_REVISION($Revision: 1.246 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -1354,30 +1354,41 @@ AC_PATH_PROGS(PDFTEX, pdftex)
 AC_SUBST(PDFTEX)
 
 #
-# Look for SGML files.  NetBSD has them under /usr/pkg/share 
-# (if installed), FreeBSD has them under /usr/local/share.
+# Look for SGML files.  The location varies; so far we
+# have seen:
+#
+# 	NetBSD 	/usr/pkg/share/docbook/dsssl/modular/
+# 	FreeBSD	/usr/local/share/docbook/dsssl/modular/
+#	Linux	/usr/local/share/dsssl/docbook/
 #
 
 SGMLDIR=""
+SGMLSTYLEDIR=""
 
 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
-	then
-		SGMLDIR=$d
-		AC_MSG_RESULT(in $SGMLDIR)
-		break
-	fi
+	for s in docbook/dsssl/modular dsssl/docbook
+	do
+		if test -f $d/$s/html/docbook.dsl
+		then
+			SGMLDIR=$d
+			SGMLSTYLEDIR=$d/$s
+			AC_MSG_RESULT(in $SGMLSTYLEDIR)
+			break
+		fi
+	done
 done
 
 if test "X$SGMLDIR" = "X"
 then
 	AC_MSG_RESULT("not found");
 	SGMLDIR=/usr/local/share/sgml
+	SGMLSTYLEDIR=/usr/local/share/docbook/dsssl/modular
 fi
 
 AC_SUBST(SGMLDIR)
+AC_SUBST(SGMLSTYLEDIR)
 
 #
 # Look for XML files.
diff --git a/make/rules.in b/make/rules.in
index e9ed3ebe2c..2ff4ca86f6 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.32 2001/03/29 01:02:18 gson Exp $
+# $Id: rules.in,v 1.33 2001/03/29 22:54:20 gson Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -181,7 +181,7 @@ INSTALL_DATA =		@INSTALL_DATA@
 
 SHARESGML = @SGMLDIR@
 OPENJADE = @JADE@
-HTMLSTYLE = ${SHARESGML}/dsssl/docbook/html/docbook.dsl
+HTMLSTYLE = @SGMLSTYLEDIR@/html/docbook.dsl
 DOCBOOK2X = ${SHARESGML}/docbook2X
 ONSGMLS = onsgmls
 SGMLSPL = sgmlspl