diff --git a/build.xml b/build.xml
index d3c897875..e4b0641f9 100644
--- a/build.xml
+++ b/build.xml
@@ -395,9 +395,12 @@
     <available property="commons.net.present"
       classname="org.apache.commons.net.ftp.FTPClient"
       classpathref="classpath"/>
-    <available property="antlr.present"
-      classname="antlr.Tool"
-      classpathref="classpath"/>
+    <condition property="antlr.present">
+  	  <or>
+  	    <available classname="org.antlr.Tool" classpathref="classpath"/>
+  	    <available classname="antlr.Tool" classpathref="classpath"/>
+      </or>
+  	</condition>
     <available property="stylebook.present"
       classname="org.apache.stylebook.Engine"
       classpathref="classpath"/>