diff --git a/Tools/Source/SurfaceArea/build.xml b/Tools/Source/SurfaceArea/build.xml
index b43d335f13..48c0b5a78b 100644
--- a/Tools/Source/SurfaceArea/build.xml
+++ b/Tools/Source/SurfaceArea/build.xml
@@ -66,7 +66,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   
   <target name="SurfaceArea" depends="init" unless="jar.newer">
     <antcall target="SurfaceArea.java.clean"/>
-    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler">
+    <java classname="org.apache.xmlbeans.impl.tool.SchemaCompiler" fork="true">
       <classpath refid="classpath"/>
       <arg value="-javasource"/>
       <arg value="1.5"/>
diff --git a/edksetup.sh b/edksetup.sh
index b191635dcc..dbaa168186 100644
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -39,7 +39,7 @@ case "`uname`" in
 esac
 
 # Now we need to build the tools.
-echo "If you have not done so, please build the tools by issuing 'ant -f \$WORKSPACE/Tools/build.xml'."
+(cd Tools; ant -noclasspath)
 fi
 fi
 fi