diff --git a/tomcat.spec b/tomcat.spec
index 9c1b1ef..ba82da8 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -221,7 +221,7 @@ export OPT_JAR_LIST="xalan-j2-serializer"
       -Dbuild.compiler="modern" \
       -Dcommons-daemon.jar="$(build-classpath apache-commons-daemon)" \
       -Dcommons-daemon.native.src.tgz="HACK" \
-      -Djdt.jar="$(build-classpath ecj)" \
+      -Djdt.jar="$(build-classpath ecj/ecj)" \
       -Dtomcat-native.tar.gz="HACK" \
       -Dtomcat-native.home="." \
       -Dcommons-daemon.native.win.mgr.exe="HACK" \
@@ -344,7 +344,7 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
     %{__ln_s} ../../java/%{name}-jsp-%{jspspec}-api.jar .
     %{__ln_s} ../../java/%{name}-servlet-%{servletspec}-api.jar .
     %{__ln_s} ../../java/%{name}-el-%{elspec}-api.jar .
-    %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
+    %{__ln_s} $(build-classpath ecj/ecj) jasper-jdt.jar
 
     # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)
     %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./
@@ -609,6 +609,9 @@ fi
 %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
 
 %changelog
+* Wed Jul 17 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.21-2
+- Update build-classpath calls to ECJ to specify the JAR we want to use
+
 * Tue Jun 18 2019 Coty Sutherland <csutherl@redhat.com> - 1:9.0.21-1
 - Update to 9.0.21