diff --git a/Tools/build.xml b/Tools/build.xml
index 305dad848c..79b4569099 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -14,7 +14,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>
   <property environment="env"/>
 
-  <target name="all" depends="C_Code"/>
+  <target name="all" depends="C_Code">
+    <echo message="The EDK II Tools build has completed!"/>
+  </target>
 
   <target name="C_Code" depends="JavaCode">
     <subant target="" inheritall="false">
@@ -38,6 +40,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           Source/FrameworkWizard/build.xml
           "/>
     </subant>
+    <echo message="The EDK II Java Tools build has completed!"/>
+  </target>
+
+  <target name="Wizard" depends="SurfaceArea">
+    <subant target="" verbose="true" inheritall="false">
+      <!-- Note: this is an ordered list. The projects have dependencies between them. -->
+      <filelist dir="."
+        files="
+          Source/FrameworkWizard/build.xml
+          "/>
+    </subant>
   </target>
 
   <target name="SurfaceArea" depends="makeCatalog">