diff --git a/prepare.xml b/prepare.xml
index ee14272..cb0ff6e 100644
--- a/prepare.xml
+++ b/prepare.xml
@@ -32,27 +32,40 @@
 
   <property name="antlib.common.git" value="https://git-wip-us.apache.org/repos/asf/ant-antlibs-common.git"/>
   <property name="git" value="git"/>
-
-  <available property="common.present" file="common" type="dir"/>
-
-  <echo message="cloning antlib-common" unless:set="common.present"/>
-  <exec executable="${git}" taskname="git" unless:set="common.present">
-    <arg value="clone"/>
-    <arg value="${antlib.common.git}"/>
-    <arg value="common"/>
-  </exec>
-
-  <echo message="updating antlib-common" if:set="common.present"/>
-  <exec executable="${git}" dir="common" taskname="git" if:set="common.present">
-    <arg value="pull"/>
-  </exec>
-
-  <echo>updating prepare.xml</echo>
-  <copy file="common/prepare.xml" tofile="prepare.xml"/>
-
-  <echo>updating AntUnit</echo>
+  
   <property name="antunit.version" value="1.3"/>
   <property name="antunit.url" value="http://repo1.maven.org/maven2/org/apache/ant/ant-antunit/${antunit.version}/ant-antunit-${antunit.version}.jar"/>
-  <get src="${antunit.url}" dest="ant-antunit.jar" usetimestamp="true"/>
+  <property name="antunit.file" value="ant-antunit.jar"/>
+
+  <available property="common.present"  file="common" type="dir"/>
+  <available property="antunit.present" file="${antunit.file}"/>
+
+  <target name="clone-common" unless="common.present">
+    <echo message="cloning antlib-common"/>
+    <exec executable="${git}" taskname="git">
+      <arg value="clone"/>
+      <arg value="${antlib.common.git}"/>
+      <arg value="common"/>
+    </exec>
+  </target>
+
+  <target name="update-common" if="common.present">
+    <echo message="updating antlib-common"/>
+    <exec executable="${git}" dir="common" taskname="git">
+      <arg value="pull"/>
+    </exec>
+  </target>
+
+  <target name="update-prepare-script">
+    <echo>updating prepare.xml</echo>
+    <copy file="common/prepare.xml" tofile="prepare.xml"/>
+  </target>
+
+  <target name="get-antunit" unless="antunit.present">
+    <echo>updating AntUnit</echo>
+    <get src="${antunit.url}" dest="${antunit.file}" usetimestamp="true"/>
+  </target>
+  
+  <target name="update" depends="clone-common,update-common,update-prepare-script,get-antunit"/>
 
 </project>
\ No newline at end of file