diff --git a/Mmakefile b/Mmakefile
index 025be419f..920dc4282 100644
--- a/Mmakefile
+++ b/Mmakefile
@@ -50,13 +50,17 @@ SUBDIRS = \
 
 MMAKEFLAGS =
 
-SUBDIR_MMAKE =	PATH=../scripts:../util:$$PATH \
-		MMAKE_VPATH=. \
-		MMAKE_DIR=../scripts \
-		DESTDIR=$(DESTDIR) \
-		../scripts/mmake $(MMAKEFLAGS)
+# We include ../../mfilterjavac in this path because $SUBDIR_MMAKE is used
+# from the grade install directories, and we need mfilterjavac in our path
+# when executing in install_grade_dir.java/library and others.
+SUBDIR_MMAKE = \
+    PATH=../scripts:../util:../mfilterjavac:../../mfilterjavac:$$PATH \
+    MMAKE_VPATH=. \
+    MMAKE_DIR=../scripts \
+    DESTDIR=$(DESTDIR) \
+    ../scripts/mmake $(MMAKEFLAGS)
 
-SUBSUBDIR_MMAKE = PATH=../../scripts:../../util:$$PATH \
+SUBSUBDIR_MMAKE = PATH=../../scripts:../../util:../../mfilterjavac:$$PATH \
 		MMAKE_VPATH=. \
 		MMAKE_DIR=../../scripts \
 		DESTDIR=$(DESTDIR) \
diff --git a/compiler/options.m b/compiler/options.m
index 9c53fc787..af4b6d06f 100644
--- a/compiler/options.m
+++ b/compiler/options.m
@@ -1840,9 +1840,7 @@ option_defaults_2(link_option, [
     mkinit_erl_command                  -   string("mkinit_erl"),
     demangle_command                    -   string("mdemangle"),
     filtercc_command                    -   string("mfiltercc"),
-    % XXX filterjavac_command is disabled until the addition of
-    % mfilterjavac has bootstrapped.
-    filterjavac_command                 -   string(""),
+    filterjavac_command                 -   string("mfilterjavac"),
     trace_libs                          -   string(""),
     thread_libs                         -   string(""),
     hwloc_libs                          -   string(""),
diff --git a/mfilterjavac/.gitignore b/mfilterjavac/.gitignore
index c84bc9f2d..82693f95f 100644
--- a/mfilterjavac/.gitignore
+++ b/mfilterjavac/.gitignore
@@ -1,5 +1,7 @@
+.mfilterjavac_tags
 MFILTERJAVAC_FLAGS
 mfilterjavac
+tags
 *.c
 *.c_date
 *.d
diff --git a/tools/bootcheck b/tools/bootcheck
index 6002d4a8c..a33ad1fc1 100755
--- a/tools/bootcheck
+++ b/tools/bootcheck
@@ -940,7 +940,7 @@ then
         if (cd $stage2dir && \
             $MMAKE $mmake_opts dep_library dep_mdbcomp \
             dep_browser dep_ssdb dep_compiler \
-            dep_slice dep_profiler dep_deep_profiler)
+            dep_slice dep_profiler dep_deep_profiler dep_mfilterjavac)
         then
             echo "building of stage 2 dependencies successful"
         else