diff --git a/steps/docbook-xml-4.5/pass1.sh b/steps/docbook-xml-4.5/pass1.sh
index 52c832e2..dd607784 100644
--- a/steps/docbook-xml-4.5/pass1.sh
+++ b/steps/docbook-xml-4.5/pass1.sh
@@ -8,71 +8,4 @@ src_install() {
     install -v -d -m755 "${DESTDIR}/usr/share/xml/docbook/xml-dtd-4.5"
     install -v -d -m755 "${DESTDIR}/etc/xml"
     cp -v -af --no-preserve=ownership docbook.cat *.dtd ent/ *.mod "${DESTDIR}/usr/share/xml/docbook/xml-dtd-4.5"
-
-    xmlcatalog --noout --create "${DESTDIR}/etc/xml/docbook"
-
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//DTD DocBook XML V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/docbookx.dtd" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "public" \
-        "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
-        "${DESTDIR}/etc/xml/docbook"
-
-    xmlcatalog --noout --add "rewriteSystem" \
-        "http://www.oasis-open.org/docbook/xml/4.5" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-        "${DESTDIR}/etc/xml/docbook"
-    xmlcatalog --noout --add "rewriteURI" \
-        "http://www.oasis-open.org/docbook/xml/4.5" \
-        "file:///usr/share/xml/docbook/xml-dtd-4.5" \
-        "${DESTDIR}/etc/xml/docbook"
-
-    xmlcatalog --noout --create "${DESTDIR}/etc/xml/catalog"
-
-    xmlcatalog --noout --add "delegatePublic" \
-        "-//OASIS//ENTITIES DocBook XML" \
-        "file:///etc/xml/docbook" \
-        "${DESTDIR}/etc/xml/catalog"
-    xmlcatalog --noout --add "delegatePublic" \
-        "-//OASIS//DTD DocBook XML" \
-        "file:///etc/xml/docbook" \
-        "${DESTDIR}/etc/xml/catalog"
-    xmlcatalog --noout --add "delegateSystem" \
-        "http://www.oasis-open.org/docbook/" \
-        "file:///etc/xml/docbook" \
-        "${DESTDIR}/etc/xml/catalog"
-    xmlcatalog --noout --add "delegateURI" \
-        "http://www.oasis-open.org/docbook/" \
-        "file:///etc/xml/docbook" \
-        "${DESTDIR}/etc/xml/catalog"
 }
diff --git a/steps/improve/populate_catalog.sh b/steps/improve/populate_catalog.sh
new file mode 100644
index 00000000..4b905dd9
--- /dev/null
+++ b/steps/improve/populate_catalog.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+xmlcatalog --noout --create "/etc/xml/docbook"
+
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/docbookx.dtd" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
+    "/etc/xml/docbook"
+
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/4.5" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+    "/etc/xml/docbook"
+xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/4.5" \
+    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
+    "/etc/xml/docbook"
+
+xmlcatalog --noout --create "/etc/xml/catalog"
+
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook" \
+    "/etc/xml/catalog"
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook" \
+    "/etc/xml/catalog"
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" \
+    "/etc/xml/catalog"
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" \
+    "/etc/xml/catalog"
+
+xmlcatalog --noout --add "rewriteSystem" \
+           "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "rewriteURI" \
+           "https://cdn.docbook.org/release/xsl-nons/1.79.2" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "rewriteSystem" \
+           "https://cdn.docbook.org/release/xsl-nons/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "rewriteURI" \
+           "https://cdn.docbook.org/release/xsl-nons/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "rewriteSystem" \
+           "http://docbook.sourceforge.net/release/xsl/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog
+xmlcatalog --noout --add "rewriteURI" \
+           "http://docbook.sourceforge.net/release/xsl/current" \
+           "/usr/share/xml/docbook/xsl-stylesheets-nons-1.79.2" \
+    /etc/xml/catalog
diff --git a/steps/manifest b/steps/manifest
index 6f5efffb..88089868 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -207,3 +207,4 @@ build: libxml2-2.10.4
 build: libxslt-1.1.38
 build: docbook-xml-4.5
 build: docbook-xsl-nons-1.79.2
+improve: populate_catalog