diff --git a/exist-distribution/pom.xml b/exist-distribution/pom.xml
index afb9456c5e..5fd75dd2f1 100644
--- a/exist-distribution/pom.xml
+++ b/exist-distribution/pom.xml
@@ -816,6 +816,50 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unzip-packageservice</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <fileset id="packageservice-fileset" dir="${expath.pkg.dir}" includes="packageservice-*.xar" />
+                                <pathconvert property="packageservice-xar-path" refid="packageservice-fileset" />
+                                <unzip src="${packageservice-xar-path}" dest="${expath.pkg.dir}-packageservice-staging/">
+                                </unzip>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>patch-packageservice</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <replace file="${expath.pkg.dir}-packageservice-staging/modules/packages.xqm" token="packages:get-version()" value="packages:get-existdb-compatible-version()" />
+                                <replace file="${expath.pkg.dir}-packageservice-staging/modules/packages.xqm" token='(util:system-property("product-semver"), util:system-property("product-version"))[1]' value='util:system-property("exist-db-expath-pkg-compatible-version")' />
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>zip-patched-packageservice</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <fileset id="packageservice-fileset" dir="${expath.pkg.dir}" includes="packageservice-*.xar" />
+                                <pathconvert property="packageservice-xar-path" refid="packageservice-fileset" />
+                                <zip destfile="${packageservice-xar-path}">
+                                    <fileset dir="${expath.pkg.dir}-packageservice-staging" />
+                                </zip>
+                            </target>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>unzip-monex</id>
                         <phase>process-resources</phase>