diff --git a/pom.xml b/pom.xml
index 56474753..d66f0547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
                 <filtering>true</filtering>
                 <includes>
                     <include>templates/**</include>
+                    <include>data/**</include>
                 </includes>
             </resource>
             <resource>
@@ -88,6 +89,7 @@
                 <filtering>false</filtering>
                 <excludes>
                     <exclude>templates/**</exclude>
+                    <exclude>data/**</exclude>
                 </excludes>
             </resource>
         </resources>
diff --git a/src/main/xar-resources/data/db4-versions/documentation-db4.xml b/src/main/xar-resources/data/db4-versions/documentation-db4.xml
index b5014ade..69a64756 100644
--- a/src/main/xar-resources/data/db4-versions/documentation-db4.xml
+++ b/src/main/xar-resources/data/db4-versions/documentation-db4.xml
@@ -64,7 +64,7 @@
         </section>
         <section id="all-documentation">
             <title>All Documentation</title>
-            <para>Besides these articles, you can search eXist-db's XQuery <ulink url="{fundocs}/index.html">function module library</ulink>.</para>
+            <para>Besides these articles, you can search eXist-db's XQuery <ulink url="{${fundocs.pkg.abbrev}}/index.html">function module library</ulink>.</para>
             <section id="getting-started">
                 <title>Getting Started</title>
                 <table class="documentation">
@@ -464,4 +464,4 @@
             </section>
         </section>
     </chapter>
-</book>
\ No newline at end of file
+</book>
diff --git a/src/main/xar-resources/data/db4-versions/extensions-db4.xml b/src/main/xar-resources/data/db4-versions/extensions-db4.xml
index c13025b7..bb14554c 100644
--- a/src/main/xar-resources/data/db4-versions/extensions-db4.xml
+++ b/src/main/xar-resources/data/db4-versions/extensions-db4.xml
@@ -69,7 +69,7 @@
             <para>eXist-db must also be told which modules to load, this is done in
         <filename>conf.xml</filename> and the Class name and Namespace for each module is listed
       below. Note – eXist-db will require a restart to load any new modules added. Once a Module is configured
-      and loaded eXist-db will display the module and its function definitions as part of the <ulink url="{fundocs}">function library</ulink> page or through
+      and loaded eXist-db will display the module and its function definitions as part of the <ulink url="{${fundocs.pkg.abbrev}}">function library</ulink> page or through
         <command>util:decribe-function()</command>.</para>
         </section>
         <section id="module_example">
@@ -310,4 +310,4 @@
           <command>Namespace:</command>  http://xmlcalabash.com </para>
         </section>
     </chapter>
-</book>
\ No newline at end of file
+</book>
diff --git a/src/main/xar-resources/data/db4-versions/incompatibilities-db4.xml b/src/main/xar-resources/data/db4-versions/incompatibilities-db4.xml
index 9d95d074..569b1a80 100644
--- a/src/main/xar-resources/data/db4-versions/incompatibilities-db4.xml
+++ b/src/main/xar-resources/data/db4-versions/incompatibilities-db4.xml
@@ -40,7 +40,7 @@
             <para>The XQuery engine has been updated to support the changed syntax for <emphasis>maps in XQuery 3.1</emphasis>. The query parser will still accept the
                 old syntax for map constructors though (<code>map { x:= "y"}</code> instead of <code>map { x: "y" }</code> in XQuery 3.1), so old
                 code should run without modifications. All map module functions from XQuery 3.1 are 
-                <ulink url="{fundocs}/view.html?uri=http://www.w3.org/2005/xpath-functions/map&amp;location=java:org.exist.xquery.functions.map.MapModule">available</ulink>.</para>
+                <ulink url="{${fundocs.pkg.abbrev}}/view.html?uri=http://www.w3.org/2005/xpath-functions/map&amp;location=java:org.exist.xquery.functions.map.MapModule">available</ulink>.</para>
             <para>The signatures for some <emphasis>higher-order utility functions</emphasis> like fn:filter, fn:fold-left and fn:fold-right have changed as well. Please review your
                 use of those functions. Also, fn:map is now called fn:for-each, though the old name is still accepted.</para>
             <para>The bundled Lucene has been upgraded from 3.6.1
@@ -192,4 +192,4 @@ dbutil:scan-collections(xs:anyURI("/db"), function($collection) {
             </section>
         </section>
     </chapter>
-</book>
\ No newline at end of file
+</book>
diff --git a/src/main/xar-resources/data/db4-versions/validation-db4.xml b/src/main/xar-resources/data/db4-versions/validation-db4.xml
index 47e00446..110241ec 100644
--- a/src/main/xar-resources/data/db4-versions/validation-db4.xml
+++ b/src/main/xar-resources/data/db4-versions/validation-db4.xml
@@ -142,7 +142,7 @@
                     <listitem>
                         <para>Jing</para>
                     </listitem>
-                </itemizedlist>Each of these options are discussed in the following sections. Consult the <ulink url="{fundocs}/view.html?uri=http://exist-db.org/xquery/validation">XQuery Function Documentation</ulink> for detailed functions
+                </itemizedlist>Each of these options are discussed in the following sections. Consult the <ulink url="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/validation">XQuery Function Documentation</ulink> for detailed functions
                 descriptions.</para>
             <section>
                 <title>JAXP</title>
@@ -482,4 +482,4 @@
             </para>
         </section>
     </chapter>
-</book>
\ No newline at end of file
+</book>
diff --git a/src/main/xar-resources/data/db4-versions/xquery-db4.xml b/src/main/xar-resources/data/db4-versions/xquery-db4.xml
index ef6e6b2d..2d1e83c9 100644
--- a/src/main/xar-resources/data/db4-versions/xquery-db4.xml
+++ b/src/main/xar-resources/data/db4-versions/xquery-db4.xml
@@ -130,7 +130,7 @@
                             currently not support the <ulink url="http://www.w3.org/TR/xquery/#id-schema-import-feature">schema import</ulink> and 
                             <ulink url="http://www.w3.org/TR/xquery/#id-schema-validation-feature">schema validation features</ulink>
                             defined as <ulink url="http://www.w3.org/TR/xquery/#id-conform-optional-features">optional</ulink> 
-                            in the XQuery specification. eXist-db provides <ulink url="{fundocs}/view.html?uri=http://exist-db.org/xquery/validation&amp;location=java:org.exist.xquery.functions.validation.ValidationModule">extension functions</ulink> 
+                            in the XQuery specification. eXist-db provides <ulink url="{${fundocs.pkg.abbrev}}/view.html?uri=http://exist-db.org/xquery/validation&amp;location=java:org.exist.xquery.functions.validation.ValidationModule">extension functions</ulink> 
                             to perform XML validation. The database does not
                             store type information along with the nodes. It therefore cannot know
                             the typed value of a node and has to assume