diff --git a/pkg.info b/pkg.info
index 003219d..85fb424 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,9 +1,11 @@
 name: docbook-xsl-nons
 description: Docbook XSL modular stylesheet
 version: 1.79.2
-revision: 3
+revision: 4
 url: https://docbook.org/
 license: LicenseRef-docbook-XSL
+maintainers:
+  - enumdev@enumerated.dev
 architecture: any
 output_architecture: any
 type: source
@@ -11,3 +13,8 @@ depends:
   - docbook-xml
   - libxml2
   - libxslt
+downloads:
+  - url: https://github.com/docbook/xslt10-stylesheets/releases/download/release/${BPM_PKG_VERSION}/docbook-xsl-nons-${BPM_PKG_VERSION}.tar.gz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: f89425b44e48aad24319a2f0d38e0cb6059fdc7dbaf31787c8346c748175ca8e
diff --git a/source-files/765567_non-recursive_string_subst.patch b/source-files/765567_non-recursive_string_subst.patch
new file mode 100644
index 0000000..ae845ad
--- /dev/null
+++ b/source-files/765567_non-recursive_string_subst.patch
@@ -0,0 +1,32 @@
+Description: use EXSLT "replace" function when available
+ A recursive implementation  of string.subst is problematic,
+ long strings with many matches will cause stack overflows.
+Author: Peter De Wachter <pdewacht@gmail.com>
+Bug-Debian: https://bugs.debian.org/750593
+
+--- docbook-xsl-1.78.1+dfsg.orig/docbook-xsl/lib/lib.xsl
++++ docbook-xsl-1.78.1+dfsg/docbook-xsl/lib/lib.xsl
+@@ -6,7 +6,11 @@
+ 
+      This module implements DTD-independent functions
+ 
+-     ******************************************************************** --><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++     ******************************************************************** -->
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:str="http://exslt.org/strings"
++                exclude-result-prefixes="str"
++                version="1.0">
+ 
+ <xsl:template name="dot.count">
+   <!-- Returns the number of "." characters in a string -->
+@@ -52,6 +56,9 @@
+   <xsl:param name="replacement"/>
+ 
+   <xsl:choose>
++    <xsl:when test="function-available('str:replace')">
++      <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
++    </xsl:when>
+     <xsl:when test="contains($string, $target)">
+       <xsl:variable name="rest">
+         <xsl:call-template name="string.subst">
+
diff --git a/source.sh b/source.sh
index 4d362b8..7a7d52b 100644
--- a/source.sh
+++ b/source.sh
@@ -2,18 +2,11 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://github.com/docbook/xslt10-stylesheets/releases/download/release/${BPM_PKG_VERSION}/docbook-xsl-nons-${BPM_PKG_VERSION}.tar.bz2"
-DOWNLOAD_DOCS="https://github.com/docbook/xslt10-stylesheets/releases/download/release/${BPM_PKG_VERSION}/docbook-xsl-doc-${BPM_PKG_VERSION}.tar.bz2"
-FILENAME="${DOWNLOAD##*/}"
-FILENAME_DOCS="${DOWNLOAD_DOCS##*/}"
-
 # The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
+# This function is used for putting downloaded files to the correct location or applying patches
 prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-  wget "$DOWNLOAD_DOCS"
-  tar -xvf "$FILENAME_DOCS" --strip-components=1 -C "$BPM_SOURCE"
+  cd "$BPM_SOURCE"
+  patch -Np2 -i "$BPM_WORKDIR"/765567_non-recursive_string_subst.patch
 }
 
 # The package function is executed in the source directory
@@ -30,14 +23,6 @@ package() {
     done
   )
 
-  install -Dm644 VERSION{,.xsl} -t "$BPM_OUTPUT"/usr/share/xml/docbook/xsl-stylesheets-nons-${BPM_PKG_VERSION}
-
-  install -Dvm644 README \
-                      "$BPM_OUTPUT"/usr/share/doc/docbook-xsl-nons/README.txt
-  install -Dvm644 RELEASE-NOTES* NEWS* \
-                      "$BPM_OUTPUT"/usr/share/doc/docbook-xsl-nons
-
-  cp -v -R doc/* "$BPM_OUTPUT"/usr/share/doc/docbook-xsl-nons
-
+  # Install package license
   install -Dm644 COPYING "$BPM_OUTPUT"/usr/share/licenses/docbook-xsl-nons/COPYING
 }