diff --git a/mozilla/modules/plugin/Makefile.in b/mozilla/modules/plugin/Makefile.in
index 424d5090953..bcf00a8f265 100644
--- a/mozilla/modules/plugin/Makefile.in
+++ b/mozilla/modules/plugin/Makefile.in
@@ -69,7 +69,10 @@ TOOL_DIRS += samples/default/windows
 endif
 
 ifeq ($(OS_ARCH),OS2)
-TOOL_DIRS += samples/default/os2 os2wrapper
+TOOL_DIRS += samples/default/os2
+ifdef MOZ_OJI
+TOOL_DIRS += os2wrapper
+endif
 ifdef ENABLE_TESTS
 TOOL_DIRS += tools/tester/common tools/tester/os2
 endif