diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 8e282ef4b7e..e43072dd14a 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -88,6 +88,8 @@ ClientWallet=1
 CookieManagement=1
 SingleSignon=1
 
+MOZ_OJI=1
+
 MOZ_POST_DSO_LIB_COMMAND = @MOZ_POST_DSO_LIB_COMMAND@
 MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
 
diff --git a/config/config.mk b/config/config.mk
index 8d427238f1f..fa5419ebd48 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -531,8 +531,6 @@ DEFINES		+= -DOSARCH=\"$(OS_ARCH)\"
 #
 # Platform dependent switching off of JAVA
 #
-MOZ_OJI=1
-
 ifdef MOZ_JAVA
 DEFINES		+= -DJAVA
 ifdef MOZ_OJI