diff --git a/build.xml b/build.xml
index cd7f1ef63..c49935261 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="seeddms" basedir="." default="main">
-  <property name="tmp" value="/tmp" />
+	<property name="tmp" value="/tmp" />
 	<property name="package" value="${phing.project.name}" override="true" />
 	<property name="seeddmsurl" value="http://localhost/seeddms51x" />
 	<property name="builddir" value="${tmp}/build/${phing.project.name}" override="true" />
@@ -16,9 +16,9 @@
 	<propertyregex property="shortversion" subject="${version} kk" pattern="([56])\.([0-9]).*" replace="seeddms$1$2x" override="true"/>
 	<property name="majorversion" value="${version}" />
 	<propertyregex property="majorversion" subject="${version}" pattern="([56])\..*" replace="$1" override="true"/>
-  <property name="composer_version" value="2.8.5" />
-  <property name="composer_extra_params" value="" />
-  <property name="composer_env" value="" />
+	<property name="composer_version" value="2.8.5" />
+	<property name="composer_extra_params" value="" />
+	<property name="composer_env" value="" />
 	<property name="mink_driver" value="chrome" />
 	<property name="snooze_multiplier" value="1" />
 
@@ -43,23 +43,23 @@
 		<include name="LICENSE" />
 	</fileset>
 
-  <target name="main">
-    <echo>Hello</echo>
-  </target>
+	<target name="main">
+		<echo>Hello</echo>
+	</target>
 
-  <!-- PHP CodeSniffer -->
-  <target name="phpcbf">
-    <exec command="${srcdir}/vendor/bin/phpcbf --standard=${srcdir}/phpcs.xml" escape="false" passthru="true" checkreturn="true" />
-  </target>
-  <target name="phpcs">
-    <exec command="${srcdir}/vendor/bin/phpcs --standard=${srcdir}/phpcs.xml --report=checkstyle &gt; ${builddir}/reports/checkstyle.xml" escape="false" />
-  </target>
-  <target name="phpcs-console">
-    <exec command="${srcdir}/vendor/bin/phpcs --standard=${srcdir}/phpcs.xml" escape="false" passthru="true" checkreturn="true" />
-  </target>
+	<!-- PHP CodeSniffer -->
+	<target name="phpcbf">
+		<exec command="${srcdir}/vendor/bin/phpcbf --standard=${srcdir}/phpcs.xml" escape="false" passthru="true" checkreturn="true" />
+	</target>
+	<target name="phpcs">
+		<exec command="${srcdir}/vendor/bin/phpcs --standard=${srcdir}/phpcs.xml --report=checkstyle &gt; ${builddir}/reports/checkstyle.xml" escape="false" />
+	</target>
+	<target name="phpcs-console">
+		<exec command="${srcdir}/vendor/bin/phpcs --standard=${srcdir}/phpcs.xml" escape="false" passthru="true" checkreturn="true" />
+	</target>
 
-  <target name="php-cs-fixer-dryrun">
-    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --dry-run -vvv --diff ${srcdir}/inc" passthru="true" escape="false" checkreturn="true" />
+	<target name="php-cs-fixer-dryrun">
+		<exec command="${srcdir}/vendor/bin/php-cs-fixer fix --dry-run -vvv --diff ${srcdir}/inc" passthru="true" escape="false" checkreturn="true" />
 	</target>
 
 	<!-- PHPUnit -->
@@ -68,12 +68,12 @@
 		<!-- exec dir="${srcdir}/tests" command="SEEDDMS_URL=${seeddmsurl} SEEDDMS_MINK_DRIVER=${mink_driver} SEEDDMS_SNOOZE_MULTIPLIER=${snooze_multiplier} ${srcdir}/vendor/bin/phpunit" passthru="true" checkreturn="true" / -->
 	</target>
 
-  <target name="composer" description="Install dependencies with Composer">
-    <if>
-      <equals arg1="${composer_version}" arg2="latest-2.x" />
-      <then>
-        <httpget url="https://getcomposer.org/composer-2.phar" sslVerifyPeer="false" dir="${srcdir}" filename="composer.phar" />
-      </then>
+	<target name="composer" description="Install dependencies with Composer">
+		<if>
+			<equals arg1="${composer_version}" arg2="latest-2.x" />
+			<then>
+				<httpget url="https://getcomposer.org/composer-2.phar" sslVerifyPeer="false" dir="${srcdir}" filename="composer.phar" />
+			</then>
 			<else>
 				<if>
 					<not><available file="composer.phar" /></not>
@@ -81,9 +81,9 @@
 						<httpget url="https://getcomposer.org/download/${composer_version}/composer.phar" sslVerifyPeer="false" dir="${srcdir}" />
 					</then>
 				</if>
-      </else>
-    </if>
-    <echo message="Installing dependencies..." />
+			</else>
+		</if>
+		<echo message="Installing dependencies..." />
 		<exec command="${composer_env} php ${srcdir}/composer.phar install ${composer_extra_params}" passthru="true" checkreturn="true" />
 	</target>
 
@@ -115,9 +115,9 @@
 			<else><echo msg="This is version 5" /></else>
 		</if>
 	  <!-- make sure the work area is empty, then rebuild it -->
-    <delete dir="${builddir}/packages" includeemptydirs="true" failonerror="false" />
-    <mkdir dir="${builddir}/packages" />
-    <delete dir="${builddir}/export" includeemptydirs="true" failonerror="false" />
+		<delete dir="${builddir}/packages" includeemptydirs="true" failonerror="false" />
+		<mkdir dir="${builddir}/packages" />
+		<delete dir="${builddir}/export" includeemptydirs="true" failonerror="false" />
 		<mkdir dir="${builddir}/export/${shortversion}" />
 		<mkdir dir="${builddir}/export/${shortversion}/conf" />
 		<mkdir dir="${builddir}/export/${shortversion}/data" />
@@ -136,14 +136,14 @@
 
 		<copy file="${srcdir}/conf/settings.xml.template" tofile="${builddir}/export/${shortversion}/conf/settings.xml">
 			<filterchain>
-        <replaceregexp>
+				<replaceregexp>
 					<regexp pattern="_DBC_DBTYPE_" replace="${dbtype}"/>
 					<regexp pattern="_DBC_DBSERVER_" replace="${dbhost}"/>
 					<regexp pattern="_DBC_DBNAME_" replace="${dbname}"/>
 					<regexp pattern="_DBC_DBUSER_" replace="${dbuser}"/>
 					<regexp pattern="_DBC_DBPASS_" replace="${dbpass}"/>
 					<regexp pattern="_SHORT_VERSION_" replace="${shortversion}"/>
-        </replaceregexp>
+				</replaceregexp>
 			</filterchain>
 		</copy>
 		<copy file="${srcdir}/conf/.htaccess" tofile="${builddir}/export/${shortversion}/conf/.htaccess" />
@@ -154,11 +154,16 @@
 			<fileset dir="${srcdir}/www/ext/example" defaultexcludes="false" />
 		</copy>
 		<copy tofile="${builddir}/export/${shortversion}/composer.json" file="composer-dist.json">
+			<filterchain>
+				<replaceregexp>
+					<regexp pattern="/home/cvs/seeddms-ext/" replace="${srcdir}/../"/>
+				</replaceregexp>
+			</filterchain>
 		</copy>
-    <phingcall target="composer">
-      <property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/" />
+		<phingcall target="composer">
+			<property name="composer_extra_params" value="--working-dir=${builddir}/export/${shortversion}/" />
 			<property name="composer_envv" value="COMPOSER=${srcdir}/composer-dist.json" />
-    </phingcall>
+		</phingcall>
 		<exec command="cd ${builddir}/export/${shortversion} &amp;&amp; ln -s seeddms-${version} seeddms" />
 		<exec command="cd ${builddir}/export/${shortversion}/www &amp;&amp; ln -s ../seeddms/op" />
 		<exec command="cd ${builddir}/export/${shortversion}/www &amp;&amp; ln -s ../seeddms/out" />
@@ -176,8 +181,8 @@
 
 		<exec command="cat ${srcdir}/install/create_tables-sqlite3.sql | sqlite3 ${builddir}/export/${shortversion}/data/content.db" />
 
-    <!-- build the standard tar.gz archive -->
-    <echo message="Building .tar.gz...." />
+		<!-- build the standard tar.gz archive -->
+		<echo message="Building .tar.gz...." />
 		<exec command="cd ${builddir}/export ; tar czf ${builddir}/packages/seeddms-quickstart-${version}.tar.gz ${shortversion}" checkreturn="true" />
 		<echo message="Built in ${builddir}/packages/seeddms-quickstart-${version}.tar.gz" />
 	</target>