diff --git a/extract-binaries.xml b/extract-binaries.xml
index 2cceb8a132..312f237dd8 100644
--- a/extract-binaries.xml
+++ b/extract-binaries.xml
@@ -1,104 +1,77 @@
-<project default="extract-binaries">
-
-    <property name="binaries.linux" value="${project.build.directory}/binaries-linux-x64" />
-    <property name="binaries.osx" value="${project.build.directory}/binaries-osx-x64" />
-    <property name="binaries.win32" value="${project.build.directory}/binaries-windows" />
-    <property name="binaries.win64" value="${project.build.directory}/binaries-windows-x64" />
+<project default="extract-binaries" xmlns:unless="ant:unless">
 
     <target name="extract-binaries">
-        <mkdir dir="${binaries.linux}" />
-        <mkdir dir="${binaries.osx}" />
-        <mkdir dir="${binaries.win32}" />
-        <mkdir dir="${binaries.win64}" />
-
-        <!-- Accommodate poor Cygwin users -->
-        <pathconvert property="maven.localrepo" targetos="unix">
-            <map from="C:" to="/c" />
-            <path>
-                <pathelement path="${settings.localRepository}"/>
-            </path>
-        </pathconvert>
-
-        <!-- Tomcat -->
-        <echo>Extracting Tomcat...</echo>
-        <exec failonerror="true" executable="tar" dir="${binaries.linux}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-linux.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.osx}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-osx.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win32}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-win32.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win64}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-win64.tgz" />
-        </exec>
-        <!-- Delete ROOT folder in Tomcat -->
-        <delete dir="${binaries.linux}/apache-tomcat/webapps/ROOT"/>
-        <delete dir="${binaries.osx}/apache-tomcat/webapps/ROOT"/>
-        <delete dir="${binaries.win32}/apache-tomcat/webapps/ROOT"/>
-        <delete dir="${binaries.win64}/apache-tomcat/webapps/ROOT"/>
-
-        <!-- PostgreSQL -->
-        <echo>Extracting PostgreSQL...</echo>
-        <exec executable="tar" dir="${binaries.linux}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-linux.tgz" />
-        </exec>
-        <exec executable="tar" dir="${binaries.osx}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-osx.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win32}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-win32.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win64}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-win64.tgz" />
-        </exec>
-
-        <!-- Java -->
-        <echo>Extracting Java...</echo>
-        <exec executable="tar" dir="${binaries.linux}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-linux.tgz" />
-        </exec>
-        <exec executable="tar" dir="${binaries.osx}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-osx.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win32}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-win32.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win64}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-win64.tgz" />
-        </exec>
-
-        <!-- LibreOffice -->
-        <echo>Extracting LibreOffice...</echo>
-        <exec executable="tar" dir="${binaries.linux}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-linux.tgz" />
-        </exec>
-        <exec executable="tar" dir="${binaries.osx}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-osx.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win32}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-windows.tgz" />
-        </exec>
-        <exec failonerror="true" executable="tar" dir="${binaries.win64}">
-            <arg value="xf" />
-            <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-windows.tgz" />
-        </exec>
+        <extract-for platform="linux" unless:set="skipLinInstaller" />
+        <extract-for platform="osx" unless:set="skipOSXInstaller" />
+        <extract-for platform="win32" unless:set="skipWinInstaller" />
+        <extract-for platform="win64" unless:set="skipWinInstaller" />
     </target>
 
+    <macrodef name="extract-for">
+        <attribute name="platform" />
+
+        <sequential>
+            <echo>Extracting binaries for @{platform}</echo>
+            <!-- Set binaries folder depending on the platform -->
+            <local name="bin.folder"/>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-linux-x64">
+                <equals arg1="@{platform}" arg2="linux" />
+            </condition>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-osx-x64">
+                <equals arg1="@{platform}" arg2="osx" />
+            </condition>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-windows">
+                <equals arg1="@{platform}" arg2="win32" />
+            </condition>
+            <condition property="bin.folder" value="${project.build.directory}/binaries-windows-x64">
+                <equals arg1="@{platform}" arg2="win64" />
+            </condition>
+
+            <!-- LibreOffice is the same for win32 and win64 -->
+            <local name="libreoffice.platform"/>
+            <condition property="libreoffice.platform" value="windows" else="@{platform}">
+                <or>
+                    <equals arg1="@{platform}" arg2="win32" />
+                    <equals arg1="@{platform}" arg2="win64" />
+                </or>
+            </condition>
+
+            <!-- Accommodate poor Cygwin users -->
+            <pathconvert property="maven.localrepo" targetos="unix">
+                <map from="C:" to="/c" />
+                <path>
+                    <pathelement path="${settings.localRepository}"/>
+                </path>
+            </pathconvert>
+
+            <mkdir dir="${bin.folder}" />
+
+            <echo>  Extracting Tomcat...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/apache/tomcat/tomcat/${installer.tomcat.version}/tomcat-${installer.tomcat.version}-@{platform}.tgz" />
+            </exec>
+            <!-- Delete ROOT folder in Tomcat -->
+            <delete dir="${bin.folder}/apache-tomcat/webapps/ROOT"/>
+
+            <echo>  Extracting PostgreSQL...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/postgresql/postgresql-distribution/${installer.postgresql.version}/postgresql-distribution-${installer.postgresql.version}-@{platform}.tgz" />
+            </exec>
+
+            <echo>  Extracting Java...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/com/oracle/java/jre/${installer.java.version}/jre-${installer.java.version}-@{platform}.tgz" />
+            </exec>
+
+            <echo>  Extracting LibreOffice...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-${libreoffice.platform}.tgz" />
+            </exec>
+        </sequential>
+    </macrodef>
+
 </project>