diff --git a/Makefile.in b/Makefile.in
index d895f5e879..73355c6a44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.43 2004/03/05 04:56:57 marka Exp $
+# $Id: Makefile.in,v 1.44 2005/08/17 22:55:56 sra Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -57,3 +57,11 @@ check: test
 
 test:
 	(cd bin/tests && ${MAKE} ${MAKEDEFS} test)
+
+FAQ: FAQ.xml
+	${XSLTPROC} doc/xsl/isc-docbook-text.xsl FAQ.xml | \
+	${W3M} -T text/html -dump >$@.tmp
+	mv $@.tmp $@
+
+clean::
+	rm -f FAQ.tmp
diff --git a/configure.in b/configure.in
index 8d61335b25..326486f6e2 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.387 $)
+AC_REVISION($Revision: 1.388 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -2004,6 +2004,13 @@ AC_SUBST(LATEX)
 AC_PATH_PROGS(PDFLATEX, pdflatex, pdflatex)
 AC_SUBST(PDFLATEX)
 
+#
+# Look for w3m
+#
+
+AC_PATH_PROGS(W3M, w3m, w3m)
+AC_SUBST(W3M)
+
 #
 # Look for xsltproc (libxslt)
 #
diff --git a/doc/xsl/isc-docbook-text.xsl b/doc/xsl/isc-docbook-text.xsl
new file mode 100644
index 0000000000..aef5de2353
--- /dev/null
+++ b/doc/xsl/isc-docbook-text.xsl
@@ -0,0 +1,50 @@
+<!--
+ - Copyright (C) 2005  Internet Systems Consortium, Inc. ("ISC")
+ -
+ - Permission to use, copy, modify, and distribute this software for any
+ - purpose with or without fee is hereby granted, provided that the above
+ - copyright notice and this permission notice appear in all copies.
+ -
+ - THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ - REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ - AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ - INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ - LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ - PERFORMANCE OF THIS SOFTWARE.
+-->
+
+<!-- $Id: isc-docbook-text.xsl,v 1.1 2005/08/17 22:55:57 sra Exp $ -->
+
+<!-- Tweaks to Docbook-XSL HTML for producing flat ASCII text. --> 
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+		xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
+
+  <!-- Import our Docbook HTML stuff -->
+  <xsl:import href="isc-docbook-html.xsl"/>
+
+  <!-- Disable tables of contents (for now - tweak as needed) -->
+  <xsl:param name="generate.toc"/>
+
+  <!-- Voodoo to read i18n/l10n overrides directly from this stylesheet -->
+  <xsl:param name="local.l10n.xml" select="document('')"/>
+
+  <!-- Customize Docbook-XSL i18n/l10n mappings. -->
+  <l:i18n>
+    <l:l10n language="en" english-language-name="English">
+
+      <!-- Please use plain old ASCII quotes -->
+      <l:dingbat key="startquote" text='&quot;'/>
+      <l:dingbat key="endquote"   text='&quot;'/>
+
+    </l:l10n>
+  </l:i18n>
+
+</xsl:stylesheet>
+
+<!-- 
+  - Local variables:
+  - mode: sgml
+  - End:
+ -->
diff --git a/make/rules.in b/make/rules.in
index a30b5706be..6879ca5e0d 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rules.in,v 1.53 2005/07/19 04:55:25 marka Exp $
+# $Id: rules.in,v 1.54 2005/08/17 22:55:57 sra Exp $
 
 ###
 ### Common Makefile rules for BIND 9.
@@ -189,6 +189,7 @@ XSLTPROC =		@XSLTPROC@ --novalid --xinclude
 PERL =			@PERL@
 LATEX =			@LATEX@
 PDFLATEX =		@PDFLATEX@
+W3M =			@W3M@
 
 ###
 ### DocBook -> HTML