diff --git a/docbook-style-xsl.Makefile b/docbook-style-xsl.Makefile
index 640317b..2b74184 100644
--- a/docbook-style-xsl.Makefile
+++ b/docbook-style-xsl.Makefile
@@ -17,7 +17,7 @@ install-xsl:
 	cp html/*.xsl $(DESTDIR)/html
 	cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp
 	cp javahelp/*.xsl $(DESTDIR)/javahelp
-	cp lib/lib.xsl $(DESTDIR)/lib
+	cp lib/*.xsl $(DESTDIR)/lib
 	cp template/*.xsl $(DESTDIR)/template
 	cp xhtml/*.xsl $(DESTDIR)/xhtml
 	cp manpages/*.xsl $(DESTDIR)/manpages
diff --git a/docbook-style-xsl.spec b/docbook-style-xsl.spec
index 59492df..11a7ec0 100644
--- a/docbook-style-xsl.spec
+++ b/docbook-style-xsl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-xsl
 Version: 1.72.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
@@ -24,6 +24,7 @@ Source2: http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.t
 
 Patch1: docbook-xsl-pagesetup.patch
 Patch2: docbook-xsl-marginleft.patch
+Patch3: docbook-xsl-newmethods.patch
 
 
 %description
@@ -38,6 +39,7 @@ tar jxf %{SOURCE2}
 popd
 %patch1 -p1 -b .pagesetup
 %patch2 -p1 -b .marginleft
+%patch3 -p1 -b .newmethods
 cp %{SOURCE1} Makefile
 for f in $(find -name "*'*")
 do
@@ -97,6 +99,9 @@ CATALOG=/etc/xml/catalog
 
 
 %changelog
+* Mon Jun 18 2007 Ondrej Vasik <ovasik@redhat.com> 1.72.0-3
+- patch fixing #161619 taken from upstream
+
 * Wed Jan 24 2007 Tomas Mraz <tmraz@redhat.com> 1.72.0-2
 - Install missing *.ent from common.
 
diff --git a/docbook-xsl-newmethods.patch b/docbook-xsl-newmethods.patch
new file mode 100644
index 0000000..30e0ac8
--- /dev/null
+++ b/docbook-xsl-newmethods.patch
@@ -0,0 +1,400 @@
+diff -urNp docbook-xsl-1.72.0/html/docbook.xsl devel/html/docbook.xsl
+--- docbook-xsl-1.72.0/html/docbook.xsl	2007-01-21 18:39:03.000000000 +0100
++++ devel/html/docbook.xsl	2007-06-18 13:19:45.000000000 +0200
+@@ -25,6 +25,7 @@
+ <xsl:include href="../VERSION"/>
+ <xsl:include href="param.xsl"/>
+ <xsl:include href="../lib/lib.xsl"/>
++<xsl:include href="../lib/dumpfragment.xsl"/>
+ <xsl:include href="../common/l10n.xsl"/>
+ <xsl:include href="../common/common.xsl"/>
+ <xsl:include href="../common/labels.xsl"/>
+@@ -42,6 +43,7 @@
+ <xsl:include href="graphics.xsl"/>
+ <xsl:include href="xref.xsl"/>
+ <xsl:include href="formal.xsl"/>
++<xsl:include href="dtbl.xsl"/>
+ <xsl:include href="table.xsl"/>
+ <xsl:include href="htmltbl.xsl"/>
+ <xsl:include href="sections.xsl"/>
+diff -urNp docbook-xsl-1.72.0/html/dtbl.xsl devel/html/dtbl.xsl
+--- docbook-xsl-1.72.0/html/dtbl.xsl	1970-01-01 01:00:00.000000000 +0100
++++ devel/html/dtbl.xsl	2007-06-18 14:00:05.000000000 +0200
+@@ -0,0 +1,292 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:exsl="http://exslt.org/common"
++                xmlns:func="http://exslt.org/functions"
++                xmlns:dtbl="http://docbook.sourceforge.net/dtbl"
++                extension-element-prefixes="func"
++                exclude-result-prefixes="exsl func dtbl"
++                version="1.0">
++
++<func:function name="dtbl:convertLength">
++  <xsl:param name="arbitrary.length"/>
++
++  <xsl:variable name="pixels.per.inch" select="96"/>
++
++  <xsl:variable name="unscaled.length"
++                select="translate($arbitrary.length, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz ', '')"/>
++
++  <xsl:variable name="units"
++                select="translate($arbitrary.length,'+-0123456789. ', '')"/>
++
++  <xsl:variable name="scaled.length">
++    <xsl:choose>
++      <xsl:when test="$units='in'">
++        <xsl:value-of select="$unscaled.length * $pixels.per.inch"/>
++      </xsl:when>
++      <xsl:when test="$units='cm'">
++        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 2.54)"/>
++      </xsl:when>
++      <xsl:when test="$units='mm'">
++        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 25.4)"/>
++      </xsl:when>
++      <xsl:when test="$units='pc'">
++        <xsl:value-of select="$unscaled.length * (($pixels.per.inch div 72) * 12)"/>
++      </xsl:when>
++      <xsl:when test="$units='pt'">
++        <xsl:value-of select="$unscaled.length * ($pixels.per.inch div 72)"/>
++      </xsl:when>
++      <xsl:when test="$units='px' or $units=''">
++        <xsl:value-of select="$unscaled.length"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:message terminate="no">
++          <xsl:text>"</xsl:text>
++          <xsl:value-of select="$units"/>
++          <xsl:text>" is not a known unit.  Applying scaling factor of 1 instead.</xsl:text>
++        </xsl:message>
++        <xsl:value-of select="$unscaled.length"/>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <func:result select="round($scaled.length)"/>
++</func:function>
++
++<func:function name="dtbl:adjustColumnWidths">
++  <xsl:param name="colgroup"/>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>entering adjustColumnWidths(</xsl:text>
++      <xsl:call-template name="dump-fragment">
++        <xsl:with-param name="fragment" select="$colgroup"/>
++      </xsl:call-template>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <xsl:variable name="expanded.colgroup">
++    <xsl:apply-templates select="exsl:node-set($colgroup)/*" mode="dtbl-split-widths"/>
++  </xsl:variable>
++
++  <xsl:variable name="absolute.widths.total">
++    <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@abswidth)"/>
++  </xsl:variable>
++
++  <xsl:variable name="relative.widths.total">
++    <xsl:value-of select="sum(exsl:node-set($expanded.colgroup)//col/@relwidth)"/>
++  </xsl:variable>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>total relative widths = (</xsl:text>
++      <xsl:value-of select="$relative.widths.total"/>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++    <xsl:message>
++      <xsl:text>total absolute widths = (</xsl:text>
++      <xsl:value-of select="$absolute.widths.total"/>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <xsl:variable name="adjusted.colgroup">
++    <xsl:choose>
++      <xsl:when test="$relative.widths.total = 0">
++        <xsl:if test="$adjustColumnWidths.debug">
++          <xsl:message>all widths are absolute</xsl:message>
++        </xsl:if>
++        <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*"
++                             mode="dtbl-use-absolute-widths"/>
++      </xsl:when>
++      <xsl:when test="$absolute.widths.total = 0">
++        <xsl:if test="$adjustColumnWidths.debug">
++          <xsl:message>all widths are relative</xsl:message>
++        </xsl:if>
++        <xsl:apply-templates select="exsl:node-set($expanded.colgroup)/*"
++                             mode="dtbl-use-relative-widths">
++          <xsl:with-param name="relative.widths.total"
++                          select="$relative.widths.total"/>
++        </xsl:apply-templates>
++      </xsl:when>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:variable name="corrected.adjusted.colgroup">
++    <xsl:choose>
++      <xsl:when test="$relative.widths.total = 0">
++        <xsl:copy-of select="$adjusted.colgroup"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:variable name="widths.total"
++                      select="sum(exsl:node-set($adjusted.colgroup)//col/@width)"/>
++        <xsl:variable name="n.columns"
++                      select="count(exsl:node-set($adjusted.colgroup)//col)"/>
++        <xsl:variable name="error"
++                      select="100 - $widths.total"/>
++        <xsl:variable name="first.bad.column"
++                      select="($n.columns - $error) + 1"/>
++        <xsl:apply-templates select="exsl:node-set($adjusted.colgroup)/*"
++                             mode="dtbl-correct-rounding-error">
++          <xsl:with-param name="first.bad.column"
++                          select="$first.bad.column"/>
++        </xsl:apply-templates>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>result = (</xsl:text>
++      <xsl:call-template name="dump-fragment">
++        <xsl:with-param name="fragment" select="$corrected.adjusted.colgroup"/>
++      </xsl:call-template>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <func:result select="$corrected.adjusted.colgroup"/>
++</func:function>
++
++<xsl:template match="colgroup" mode="dtbl-correct-rounding-error">
++  <xsl:param name="first.bad.column"/>
++
++  <xsl:if test="$adjustColumnWidths.debug">
++    <xsl:message>
++      <xsl:text>first.bad.column = (</xsl:text>
++      <xsl:value-of select="$first.bad.column"/>
++      <xsl:text>)</xsl:text>
++    </xsl:message>
++  </xsl:if>
++
++  <colgroup>
++    <xsl:for-each select="col[position() &lt; $first.bad.column]">
++      <xsl:element name="col">
++        <xsl:attribute name="width">
++          <xsl:value-of select="concat(@width, '%')"/>
++        </xsl:attribute>
++      </xsl:element>
++    </xsl:for-each>
++    <xsl:for-each select="col[position() >= $first.bad.column]">
++      <xsl:element name="col">
++        <xsl:attribute name="width">
++          <xsl:value-of select="concat(@width + 1, '%')"/>
++        </xsl:attribute>
++      </xsl:element>
++    </xsl:for-each>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-correct-rounding-error">
++  <xsl:param name="error"/>
++
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="concat(round((@relwidth div $relative.widths.total) * 100))"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </xsl:element>
++</xsl:template>
++
++<xsl:template match="colgroup" mode="dtbl-use-relative-widths">
++  <xsl:param name="relative.widths.total"/>
++
++  <colgroup>
++    <xsl:apply-templates mode="dtbl-use-relative-widths">
++      <xsl:with-param name="relative.widths.total"
++                      select="$relative.widths.total"/>
++    </xsl:apply-templates>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-use-relative-widths">
++  <xsl:param name="relative.widths.total"/>
++
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="round((@relwidth div $relative.widths.total) * 100)"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </xsl:element>
++</xsl:template>
++
++<xsl:template match="colgroup" mode="dtbl-use-absolute-widths">
++  <colgroup>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-use-absolute-widths">
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="@abswidth"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-use-absolute-widths"/>
++  </xsl:element>
++</xsl:template>
++
++<xsl:template match="colgroup" mode="dtbl-split-widths">
++  <colgroup>
++    <xsl:apply-templates mode="dtbl-split-widths"/>
++  </colgroup>
++</xsl:template>
++
++<xsl:template match="col" mode="dtbl-split-widths">
++
++  <!-- width = @width ? @width : '1*' -->
++  <xsl:variable name="width">
++    <xsl:choose>
++      <xsl:when test="@width != ''">
++        <xsl:value-of select="@width"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:text>1*</xsl:text>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <!-- absolute.width = contains($width,'*') ? substring-after($width, '*') : $width -->
++  <xsl:variable name="absolute.width">
++    <xsl:choose>
++      <xsl:when test="contains($width, '*')">
++        <xsl:value-of select="substring-after($width, '*')"/>
++      </xsl:when>
++      <xsl:otherwise>
++        <xsl:value-of select="$width"/>
++      </xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:variable name="converted.absolute.width">
++    <xsl:choose>
++      <xsl:when test="$absolute.width != ''">
++        <xsl:value-of select="dtbl:convertLength($absolute.width)"/>
++      </xsl:when>
++     <xsl:otherwise>0</xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:variable name="relative.width">
++    <xsl:choose>
++      <xsl:when test="substring-before($width, '*') != ''">
++        <xsl:value-of select="substring-before($width, '*')"/>
++      </xsl:when>
++      <xsl:otherwise>0</xsl:otherwise>
++    </xsl:choose>
++  </xsl:variable>
++
++  <xsl:element name="col">
++    <xsl:attribute name="width">
++      <xsl:value-of select="$width"/>
++    </xsl:attribute>
++    <xsl:attribute name="relwidth">
++      <xsl:value-of select="$relative.width"/>
++    </xsl:attribute>
++    <xsl:attribute name="abswidth">
++      <xsl:value-of select="$converted.absolute.width"/>
++    </xsl:attribute>
++    <xsl:apply-templates mode="dtbl-split-widths"/>
++  </xsl:element>
++</xsl:template>
++
++</xsl:stylesheet>
+diff -urNp docbook-xsl-1.72.0/html/param.xsl devel/html/param.xsl
+--- docbook-xsl-1.72.0/html/param.xsl	2007-01-23 13:33:37.000000000 +0100
++++ devel/html/param.xsl	2007-06-18 13:26:41.000000000 +0200
+@@ -64,6 +64,7 @@ div.annotation-close { position: absolut
+                        right: 2px;
+                      }
+ </xsl:param>
++<xsl:param name="adjustColumnWidths.debug" select="false()"/>
+ <xsl:param name="annotation.js" select="'http://docbook.sourceforge.net/release/script/AnchorPosition.js             http://docbook.sourceforge.net/release/script/PopupWindow.js'"/>
+ <xsl:param name="annotation.graphic.open" select="'http://docbook.sourceforge.net/release/images/annot-open.png'"/>
+ <xsl:param name="annotation.graphic.close" select="'http://docbook.sourceforge.net/release/images/annot-close.png'"/>
+@@ -397,4 +398,4 @@ set       toc,title
+ <xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
+ <xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
+ 
+-</xsl:stylesheet>
+\ Chybí znak konce řádku na konci souboru
++</xsl:stylesheet>
+diff -urNp docbook-xsl-1.72.0/html/table.xsl devel/html/table.xsl
+--- docbook-xsl-1.72.0/html/table.xsl	2006-12-06 10:28:33.000000000 +0100
++++ devel/html/table.xsl	2007-06-18 13:30:00.000000000 +0200
+@@ -5,7 +5,8 @@
+                 xmlns:xtbl="xalan://com.nwalsh.xalan.Table"
+                 xmlns:lxslt="http://xml.apache.org/xslt"
+                 xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
+-                exclude-result-prefixes="doc stbl xtbl lxslt ptbl"
++                xmlns:dtbl="http://docbook.sourceforge.net/dtbl"
++                exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl"
+                 version='1.0'>
+ 
+ <xsl:include href="../common/table.xsl"/>
+@@ -373,6 +374,9 @@
+           <xsl:when test="$use.extensions != 0
+                           and $tablecolumns.extension != 0">
+             <xsl:choose>
++              <xsl:when test="function-available('dtbl:convertLength')">
++                <xsl:value-of select="dtbl:convertLength($table.width)"/>
++              </xsl:when>
+               <xsl:when test="function-available('stbl:convertLength')">
+                 <xsl:value-of select="stbl:convertLength($table.width)"/>
+               </xsl:when>
+@@ -397,6 +401,9 @@
+       <xsl:when test="$use.extensions != 0
+                       and $tablecolumns.extension != 0">
+         <xsl:choose>
++          <xsl:when test="function-available('dtbl:adjustColumnWidths')">
++            <xsl:copy-of select="dtbl:adjustColumnWidths($colgroup)"/>
++          </xsl:when>
+           <xsl:when test="function-available('stbl:adjustColumnWidths')">
+             <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
+           </xsl:when>
+diff -urNp docbook-xsl-1.72.0/lib/dumpfragment.xsl devel/lib/dumpfragment.xsl
+--- docbook-xsl-1.72.0/lib/dumpfragment.xsl	1970-01-01 01:00:00.000000000 +0100
++++ devel/lib/dumpfragment.xsl	2007-06-18 14:00:52.000000000 +0200
+@@ -0,0 +1,30 @@
++<?xml version="1.0" encoding="US-ASCII"?>
++<xsl:stylesheet version="1.0"
++                xmlns:exsl="http://exslt.org/common"
++                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns="http://www.w3.org/1999/xhtml"
++                exclude-result-prefixes="exsl">
++
++<xsl:template name="dump-fragment">
++  <xsl:param name="fragment"/>
++  <xsl:apply-templates select="exsl:node-set($fragment)/*" mode="dump-fragment"/>
++</xsl:template>
++
++<xsl:template match="@*" mode="dump-fragment">
++  <xsl:text> </xsl:text>
++  <xsl:value-of select="local-name(.)"/>
++  <xsl:text>="</xsl:text>
++  <xsl:value-of select="."/>
++  <xsl:text>"</xsl:text>
++</xsl:template>
++
++<xsl:template match="*" mode="dump-fragment">
++  <xsl:text>&lt;</xsl:text><xsl:value-of select="local-name(.)"/>
++  <xsl:apply-templates select="@*" mode="dump-fragment"/>
++  <xsl:text>></xsl:text>
++  <xsl:apply-templates mode="dump-fragment"/>
++  <xsl:text>&lt;/</xsl:text><xsl:value-of select="local-name(.)"/>
++  <xsl:text>></xsl:text>
++</xsl:template>
++
++</xsl:stylesheet>