diff --git a/test/more/tests/book/boostbook.gold b/test/more/tests/book/boostbook.gold
index ec0007b..6f07643 100644
--- a/test/more/tests/book/boostbook.gold
+++ b/test/more/tests/book/boostbook.gold
@@ -1,4 +1,4 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<book xmlns:xi="http://www.w3.org/2001/XInclude" id="test" last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $">
+<book xmlns:xi="http://www.w3.org/2001/XInclude" id="test" lang="en">
   <title>Test 'boostbook' root.</title>
 </book>
\ No newline at end of file
diff --git a/test/more/tests/book/boostbook.xml b/test/more/tests/book/boostbook.xml
index 37c4ba8..dc49c0a 100644
--- a/test/more/tests/book/boostbook.xml
+++ b/test/more/tests/book/boostbook.xml
@@ -2,7 +2,8 @@
 <!DOCTYPE boostbook PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
   "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <boostbook id="test" xmlns:xi="http://www.w3.org/2001/XInclude"
-           last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $">
+           last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $"
+           lang="en">
   <title>Test 'boostbook' root.</title>
 </boostbook>
 
diff --git a/test/more/tests/book/chapter.gold b/test/more/tests/book/chapter.gold
new file mode 100644
index 0000000..a57055b
--- /dev/null
+++ b/test/more/tests/book/chapter.gold
@@ -0,0 +1,4 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter id="test" last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $" lang="en">
+  <title>Test 'boostbook' root.</title>
+</chapter>
\ No newline at end of file
diff --git a/test/more/tests/book/chapter.xml b/test/more/tests/book/chapter.xml
new file mode 100644
index 0000000..2372e8d
--- /dev/null
+++ b/test/more/tests/book/chapter.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+  "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<chapter id="test" xmlns:xi="http://www.w3.org/2001/XInclude"
+           last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $"
+           lang="en">
+  <title>Test 'boostbook' root.</title>
+</chapter>
+
+
diff --git a/test/more/tests/book/library-autoid.gold b/test/more/tests/book/library-autoid.gold
new file mode 100644
index 0000000..4a20eb2
--- /dev/null
+++ b/test/more/tests/book/library-autoid.gold
@@ -0,0 +1,4 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter lang="en" id="id1-bb">
+  <title>Test 'boostbook' root.</title>
+</chapter>
\ No newline at end of file
diff --git a/test/more/tests/book/library-autoid.xml b/test/more/tests/book/library-autoid.xml
new file mode 100644
index 0000000..bcf50a4
--- /dev/null
+++ b/test/more/tests/book/library-autoid.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+  "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<library lang="en">
+  <title>Test 'boostbook' root.</title>
+</library>
+
+
diff --git a/test/more/tests/book/library.gold b/test/more/tests/book/library.gold
new file mode 100644
index 0000000..5fb2b49
--- /dev/null
+++ b/test/more/tests/book/library.gold
@@ -0,0 +1,4 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<chapter xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" id="test" rev:last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $">
+  <title>Test 'boostbook' root.</title>
+</chapter>
\ No newline at end of file
diff --git a/test/more/tests/book/library.xml b/test/more/tests/book/library.xml
new file mode 100644
index 0000000..f431ebf
--- /dev/null
+++ b/test/more/tests/book/library.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+  "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
+<library id="test" xmlns:xi="http://www.w3.org/2001/XInclude"
+           last-revision="$Date: 2010-10-30 15:29:27 +0100 (Sat, 30 Oct 2010) $">
+  <title>Test 'boostbook' root.</title>
+</library>
+
+
diff --git a/xsl/docbook.xsl b/xsl/docbook.xsl
index fb67e6d..063622f 100644
--- a/xsl/docbook.xsl
+++ b/xsl/docbook.xsl
@@ -399,16 +399,12 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '<xsl:value-o
                   ($boost.include.libraries='' or
                    contains($boost.include.libraries, @id))">
       <chapter>
-        <xsl:attribute name="id">
-          <xsl:choose>
-            <xsl:when test="@id">
-              <xsl:value-of select="@id"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="generate.id"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
+        <xsl:copy-of select="@*[not(contains(' last-revision name dirname html-only url ', concat(' ',local-name(),' ')))]"/>
+        <xsl:if test="not(@id)">
+          <xsl:attribute name="id">
+            <xsl:call-template name="generate.id"/>
+          </xsl:attribute>
+        </xsl:if>
 
         <xsl:if test="@last-revision">
           <xsl:attribute
@@ -437,7 +433,10 @@ Error: XSL template 'link-or-anchor' called with invalid link-type '<xsl:value-o
   </xsl:template>
 
   <xsl:template match="boostbook">
-    <book><xsl:copy-of select="@*"/><xsl:apply-templates/></book>
+    <book>
+      <xsl:copy-of select="@*[not(contains(' last-revision name dirname html-only url ', concat(' ',local-name(),' ')))]"/>
+      <xsl:apply-templates/>
+    </book>
   </xsl:template>
 
   <xsl:template match="programlisting">