diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 6654a7e0c1f7..39fe8bb005aa 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -410,11 +410,11 @@ pre-configure:
 
 post-build:
 .if !defined(BUILD_JRE)
-	@${JDK_IMAGEDIR}/bin/jar cfe \
+	@${BOOTSTRAPJDKDIR}/bin/jar cfe \
 	    ${JRE_IMAGEDIR}/lib/compilefontconfig.jar \
 	    build.tools.compilefontconfig.CompileFontConfig \
 	    -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/compilefontconfig
-	@${JDK_IMAGEDIR}/bin/jar cfe \
+	@${BOOTSTRAPJDKDIR}/bin/jar cfe \
 	    ${JRE_IMAGEDIR}/lib/javazic.jar \
 	    build.tools.tzdb.TzdbZoneRulesCompiler \
 	    -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb