diff --git a/doc/reference.dtdxml b/doc/reference.dtdxml
index 3b28855..b013579 100644
--- a/doc/reference.dtdxml
+++ b/doc/reference.dtdxml
@@ -17,6 +17,7 @@
 <attpurpose name="filename">The name of the file associated with this element</attpurpose>
 <attpurpose name="specifiers">The specifiers for this function, e.g., <code>inline</code>, <code>static</code>, etc.</attpurpose>
 <attpurpose name="cv">cv-qualifiers for this method, e.g., <code>const volatile</code></attpurpose>
+<attpurpose name="pack">Set to '1' if the parameter is a parameter pack.</attpurpose>
 
 <entity name="boost.class.content"
         type="param"
@@ -533,11 +534,16 @@
 <attlist name="template-type-parameter">
 <attdecl>
     name                     CDATA  #REQUIRED
+    pack                     CDATA  #IMPLIED 
     %boost.common.attrib;</attdecl>
 <attribute name="last-revision"
            type="#IMPLIED"
            value="CDATA"
            default=""/>
+<attribute name="pack"
+           type="#IMPLIED"
+           value="CDATA"
+           default=""/>
 <attribute name="name"
            type="#REQUIRED"
            value="CDATA"
@@ -825,6 +831,7 @@
 <attlist name="inherit">
 <attdecl>
     access  CDATA  #REQUIRED
+    pack    CDATA  #IMPLIED 
     %boost.common.attrib;</attdecl>
 <attribute name="last-revision"
            type="#IMPLIED"
@@ -840,6 +847,12 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
+<attribute name="pack"
+           type="#IMPLIED"
+           value="CDATA"
+           default="">
+  <purpose>Set to '1' if this is a pack exapansion.</purpose>
+</attribute>
 <attribute name="xml:base"
            type="#IMPLIED"
            value="CDATA"
@@ -1656,7 +1669,9 @@
 </element>
 
 <attlist name="template-arg">
-<attdecl> %boost.common.attrib;</attdecl>
+<attdecl>
+    pack    CDATA  #IMPLIED 
+    %boost.common.attrib;</attdecl>
 <attribute name="last-revision"
            type="#IMPLIED"
            value="CDATA"
@@ -1665,6 +1680,12 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
+<attribute name="pack"
+           type="#IMPLIED"
+           value="CDATA"
+           default="">
+  <purpose>Set to '1' if this is a pack exapansion.</purpose>
+</attribute>
 <attribute name="xml:base"
            type="#IMPLIED"
            value="CDATA"
@@ -2159,11 +2180,16 @@
 
 <attlist name="parameter">
 <attdecl>
-     name CDATA #IMPLIED</attdecl>
+     name CDATA #IMPLIED
+     pack CDATA #IMPLIED</attdecl>
 <attribute name="name"
            type="#IMPLIED"
            value="CDATA"
            default=""/>
+<attribute name="pack"
+           type="#IMPLIED"
+           value="CDATA"
+           default=""/>
 </attlist>
 
 <element name="signature"
@@ -2709,11 +2735,16 @@
 <attlist name="template-nontype-parameter">
 <attdecl>
     name                     CDATA  #REQUIRED
+    pack                     CDATA  #IMPLIED 
     %boost.common.attrib;</attdecl>
 <attribute name="last-revision"
            type="#IMPLIED"
            value="CDATA"
            default=""/>
+<attribute name="pack"
+           type="#IMPLIED"
+           value="CDATA"
+           default=""/>
 <attribute name="name"
            type="#REQUIRED"
            value="CDATA"
diff --git a/doc/reference.xml b/doc/reference.xml
index a83ee7a..0a7fc82 100644
--- a/doc/reference.xml
+++ b/doc/reference.xml
@@ -288,6 +288,7 @@
           <tbody>
 
 <row><entry>last-revision</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to $Date$ to keep "last revised" information in sync with CVS changes</entry></row>
+<row><entry>pack</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to '1' if the parameter is a parameter pack.</entry></row>
 <row><entry>name</entry><entry>#REQUIRED</entry><entry>CDATA</entry><entry>The name of the element being declared to referenced</entry></row>
 <row><entry>id</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>A global identifier for this element</entry></row>
 <row><entry>xml:base</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Implementation detail used by XIncludes</entry></row>
@@ -550,6 +551,7 @@
 <row><entry>last-revision</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to $Date$ to keep "last revised" information in sync with CVS changes</entry></row>
 <row><entry>access</entry><entry>#REQUIRED</entry><entry>CDATA</entry><entry>The access specifier ("public", "private", or "protected") of the inheritance.</entry></row>
 <row><entry>id</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>A global identifier for this element</entry></row>
+<row><entry>pack</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to '1' if this is a pack exapansion.</entry></row>
 <row><entry>xml:base</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Implementation detail used by XIncludes</entry></row>
 </tbody>
         </tgroup>
@@ -1300,6 +1302,7 @@
 
 <row><entry>last-revision</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to $Date$ to keep "last revised" information in sync with CVS changes</entry></row>
 <row><entry>id</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>A global identifier for this element</entry></row>
+<row><entry>pack</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to '1' if this is a pack exapansion.</entry></row>
 <row><entry>xml:base</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Implementation detail used by XIncludes</entry></row>
 </tbody>
         </tgroup>
@@ -1806,6 +1809,7 @@
           <tbody>
 
 <row><entry>name</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>The name of the element being declared to referenced</entry></row>
+<row><entry>pack</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to '1' if the parameter is a parameter pack.</entry></row>
 </tbody>
         </tgroup>
       </informaltable>
@@ -2299,6 +2303,7 @@
           <tbody>
 
 <row><entry>last-revision</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to $Date$ to keep "last revised" information in sync with CVS changes</entry></row>
+<row><entry>pack</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Set to '1' if the parameter is a parameter pack.</entry></row>
 <row><entry>name</entry><entry>#REQUIRED</entry><entry>CDATA</entry><entry>The name of the element being declared to referenced</entry></row>
 <row><entry>id</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>A global identifier for this element</entry></row>
 <row><entry>xml:base</entry><entry>#IMPLIED</entry><entry>CDATA</entry><entry>Implementation detail used by XIncludes</entry></row>
diff --git a/dtd/boostbook.dtd b/dtd/boostbook.dtd
index 27388ef..ba9d610 100644
--- a/dtd/boostbook.dtd
+++ b/dtd/boostbook.dtd
@@ -167,11 +167,13 @@
 <!ELEMENT template-type-parameter (default?, purpose?)>
 <!ATTLIST template-type-parameter
     name                     CDATA  #REQUIRED
+    pack                     CDATA  #IMPLIED 
     %boost.common.attrib;>
 
 <!ELEMENT template-nontype-parameter (type, default?, purpose?)>
 <!ATTLIST template-nontype-parameter
     name                     CDATA  #REQUIRED
+    pack                     CDATA  #IMPLIED 
     %boost.common.attrib;>
 
 <!ELEMENT template-varargs EMPTY>
@@ -181,7 +183,9 @@
 <!ATTLIST specialization %boost.common.attrib;>
 
 <!ELEMENT template-arg ANY>
-<!ATTLIST template-arg %boost.common.attrib;>
+<!ATTLIST template-arg
+    pack    CDATA  #IMPLIED 
+    %boost.common.attrib;>
 
 <!ELEMENT default ANY>
 <!ATTLIST default %boost.common.attrib;>
@@ -189,6 +193,7 @@
 <!ELEMENT inherit (type, purpose?)>
 <!ATTLIST inherit
     access  CDATA  #IMPLIED
+    pack    CDATA  #IMPLIED 
     %boost.common.attrib;>
 
 <!ELEMENT purpose ANY>
@@ -397,7 +402,8 @@
 
 <!ELEMENT parameter (paramtype, default?, description?)>
 <!ATTLIST parameter
-     name CDATA #IMPLIED>
+     name CDATA #IMPLIED
+     pack CDATA #IMPLIED>
 
 <!ELEMENT programlisting ANY>
 <!ATTLIST programlisting
diff --git a/xsl/function.xsl b/xsl/function.xsl
index f6ef6e0..7465da8 100644
--- a/xsl/function.xsl
+++ b/xsl/function.xsl
@@ -363,6 +363,9 @@
     <xsl:if test="$parameters">
       <!-- Information for this parameter -->
       <xsl:variable name="parameter" select="$parameters[position()=1]"/>
+      <xsl:variable name="pack">
+        <xsl:if test="$parameter/@pack=1"><xsl:text>...</xsl:text></xsl:if>
+      </xsl:variable>
       <xsl:variable name="name">
         <xsl:if test="$include-names and $parameter/@name != ''">
           <xsl:text> </xsl:text><xsl:value-of select="$parameter/@name"/>
@@ -393,7 +396,7 @@
         </xsl:choose>
       </xsl:variable>
 
-      <xsl:variable name="text" select="concat($type, $name, $default)"/>
+      <xsl:variable name="text" select="concat($type, $pack, $name, $default)"/>
 
       <xsl:variable name="end-column"
         select="$column + string-length($prefix) + string-length($text)"/>
@@ -410,6 +413,7 @@
                 mode="annotation">
                 <xsl:with-param name="highlight" select="true()"/>
               </xsl:apply-templates>
+              <xsl:value-of select="$pack"/>
               <xsl:value-of select="$name"/>
               <xsl:copy-of select="$default"/>
             </xsl:when>
@@ -446,6 +450,7 @@
                 mode="annotation">
                 <xsl:with-param name="highlight" select="true()"/>
               </xsl:apply-templates>
+              <xsl:value-of select="$pack"/>
               <xsl:value-of select="$name"/>
               <xsl:value-of select="$default"/>
             </xsl:when>
diff --git a/xsl/lookup.xsl b/xsl/lookup.xsl
index 2bf75c8..95505a8 100644
--- a/xsl/lookup.xsl
+++ b/xsl/lookup.xsl
@@ -194,29 +194,25 @@
     <xsl:value-of select="@name"/>
   </xsl:template>
 
-  <xsl:template name="print-specialization-name">
+  <xsl:template match="template-arg" mode="print-name">
+    <xsl:if test="position() &gt; 1">
+      <xsl:text>, </xsl:text>
+    </xsl:if>
+    <xsl:value-of select="text()"/>
+    <xsl:if test="@pack=1">
+      <xsl:text>...</xsl:text>
+    </xsl:if>
+  </xsl:template>
+
+  <xsl:template
+      match="struct-specialization|class-specialization|union-specialization"
+      mode="print-name">
     <xsl:value-of select="@name"/>
     <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="specialization/template-arg[position() = 1]/text()"/>
-    <xsl:for-each select="specialization/template-arg[position() &gt; 1]">
-      <xsl:text>,</xsl:text>
-      <xsl:value-of select="text()"/>
-    </xsl:for-each>
+    <xsl:apply-templates select="specialization/template-arg" mode="print-name"/>
     <xsl:text>&gt;</xsl:text>
   </xsl:template>
 
-  <xsl:template match="struct-specialization" mode="print-name">
-    <xsl:call-template name="print-specialization-name"/>
-  </xsl:template>
-
-  <xsl:template match="class-specialization" mode="print-name">
-    <xsl:call-template name="print-specialization-name"/>
-  </xsl:template>
-
-  <xsl:template match="union-specialization" mode="print-name">
-    <xsl:call-template name="print-specialization-name"/>
-  </xsl:template>
-
   <xsl:template name="name-matches-node">
     <!-- The name we are looking for -->
     <xsl:param name="name"/>
diff --git a/xsl/template.xsl b/xsl/template.xsl
index 53b64e2..730cb55 100644
--- a/xsl/template.xsl
+++ b/xsl/template.xsl
@@ -314,6 +314,7 @@
         <xsl:text>typename</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:if test="$parameter/@pack=1"><xsl:text>...</xsl:text></xsl:if>
     <xsl:text> </xsl:text>
 
     <xsl:call-template name="template.parameter.name">
@@ -388,6 +389,7 @@
         <xsl:value-of select="$parameter/type/*|$parameter/type/text()"/>
       </xsl:otherwise>
     </xsl:choose>
+    <xsl:if test="$parameter/@pack=1"><xsl:text>...</xsl:text></xsl:if>
     <xsl:text> </xsl:text>
 
     <xsl:call-template name="template.parameter.name">
@@ -438,6 +440,9 @@
       <xsl:text>, </xsl:text>
     </xsl:if>
     <xsl:apply-templates mode="highlight"/>
+    <xsl:if test="@pack=1">
+      <xsl:text>...</xsl:text>
+    </xsl:if>
   </xsl:template>
 </xsl:stylesheet>
 
diff --git a/xsl/type.xsl b/xsl/type.xsl
index 5c189f1..3f6f567 100644
--- a/xsl/type.xsl
+++ b/xsl/type.xsl
@@ -533,6 +533,8 @@ Unknown type element "<xsl:value-of select="local-name(.)"/>" in type.display.na
         </xsl:otherwise>
       </xsl:choose>
 
+      <xsl:if test="@pack=1"><xsl:text>...</xsl:text></xsl:if>
+
       <!-- Output a comma if not at the end -->
       <xsl:if test="position() &lt; $n">
         <xsl:text>,</xsl:text>
@@ -626,6 +628,7 @@ Unknown type element "<xsl:value-of select="local-name(.)"/>" in type.display.na
     <xsl:apply-templates mode="annotation">
       <xsl:with-param name="highlight" select="true()"/>
     </xsl:apply-templates>
+    <xsl:if test="@pack=1"><xsl:text>...</xsl:text></xsl:if>
   </xsl:template>
 
   <!-- Find the maximum length of the types in typedefs -->
@@ -1058,7 +1061,7 @@ Unknown type element "<xsl:value-of select="local-name(.)"/>" in type.display.na
           <xsl:with-param name="allow-synopsis-anchors" select="true()"/>
         </xsl:call-template>
         <!-- Associated free functions -->
-        <xsl:apply-templates select="ancestor-or-self::*/free-function-group"
+        <xsl:apply-templates select="free-function-group"
           mode="synopsis">
           <xsl:with-param name="indentation" select="$indentation"/>
           <xsl:with-param name="class" select="@name"/>