diff --git a/build.xml b/build.xml
index a3c1ad090..781c14cf4 100755
--- a/build.xml
+++ b/build.xml
@@ -102,26 +102,27 @@
 	</target>
 
 	<!-- Compiles all .tab files -->
-	<target name="compile_tab">
-		<property name="server_datatables" location="${dsrc_server}/datatables"/>
-		<property name="shared_datatables" location="${dsrc_shared}/datatables"/>
-		<property name="include_datatables" location="${shared_datatables}/include"/>
+	<target name="compile_tab" depends="init" description="compile datatable files (.tab)">
+		<fileset id="tab_files" dir="../dsrc">
+			<include name="**/*.tab" />
+			<exclude name="**/object_template_crc_string_table.tab" />
+			<exclude name="**/quest_crc_string_table.tab" />
+		</fileset>
 		<touch mkdirs="true" verbose="false">
-			<fileset dir="." includes="**/*.tab"/>
-			<mapper type="glob" from="*.tab" to="${data}/*/.tmp" />
+			<fileset refid="tab_files"/>
+			<mapper type="glob" from="*.tab" to="build/data/*/.tmp" />
 		</touch>
 		<delete>
-			<fileset dir="${data}" includes="**/.tmp"/>
+			<fileset dir="build/data" includes="**/.tmp"/>
 		</delete>
-		<apply executable="./DataTableTool" dir="${tools_home}" dest="${data_server}" parallel="false" type="file" failonerror="true">
-			<env key="PATH" value="${env.PATH}:${tools_home}"/>
+		<apply executable="${tools_home}/DataTableTool" dir=".." dest="../dsrc/build/data" parallel="false" type="file" failonerror="true" verbose="true">
 			<arg value="-i"/>
 			<srcfile prefix="&quot;" suffix="&quot;"/>
 			<arg value="-- -s SharedFile"/>
 			<arg value="searchPath10=${data_shared}"/>
 			<arg value="searchPath10=${data_server}"/>
-			<arg value="searchPath10=${data_server}"/>
-			<fileset dir="." includes="**/*.tab" excludes="**/object_template_crc_string_table.tab,**/quest_crc_string_table.tab"/>
+			<arg value="searchPath10=${data_client}"/>
+			<fileset refid="tab_files" />
 			<mapper type="glob" from="*.tab" to="*.iff"/>
 		</apply>
 		<antcall target="cleanup"/>