diff --git a/ChangeLog b/ChangeLog
index 7bc9e088..2d1c5ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-02  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Contributed by Shaun Jackman  <sjackman@gmail.com>
+	bug #21798: Fix both XSLT scripts
+	* tools/get-dw-params.xsl (format-hex): Add the parameter count.
+	* tools/get-hv-params.xsl (format_cstack): Ditto.
+
 2009-07-02  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #21922: ATmega163 still not working in version 5.5
diff --git a/tools/get-dw-params.xsl b/tools/get-dw-params.xsl
index 3561db91..457617bc 100644
--- a/tools/get-dw-params.xsl
+++ b/tools/get-dw-params.xsl
@@ -112,6 +112,7 @@
     <!-- recursively then until everything has been done -->
     <xsl:template name="format-hex">
       <xsl:param name="arg" />
+      <xsl:param name="count" />
       <xsl:choose>
         <xsl:when test="string-length($arg) &lt;= 4">
           <!-- Last element, print it, and leave template. -->
diff --git a/tools/get-hv-params.xsl b/tools/get-hv-params.xsl
index fe224284..f86bd2b0 100644
--- a/tools/get-hv-params.xsl
+++ b/tools/get-hv-params.xsl
@@ -219,6 +219,7 @@
     -->
     <xsl:template name="format_cstack">
         <xsl:param name="stack" />
+        <xsl:param name="count" />
         <xsl:choose>
             <xsl:when test="string-length($stack) &lt;= 4">
                 <!-- Last element, print it, and leave template. -->