diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am
index 3778757280..72eeab0ff5 100644
--- a/ompi/tools/wrappers/Makefile.am
+++ b/ompi/tools/wrappers/Makefile.am
@@ -11,6 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2012      Los Alamos National Security, LLC.  All rights reserved.
+# Copyright (c) 2013      Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,13 +20,21 @@
 #
 
 generated_man_pages = mpicc.1 mpic++.1 mpicxx.1 mpifort.1 mpif77.1 mpif90.1
-man_pages = $(generated_man_pages) mpijavac.1
+man_pages = $(generated_man_pages)
 
-EXTRA_DIST = mpijavac.1 mpif77.1in
+EXTRA_DIST = mpif77.1in
+
+if OMPI_WANT_JAVA_BINDINGS
+EXTRA_DIST += mpijavac.1
+man_pages += mpijavac.1
+endif
 
 if OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
 
 bin_SCRIPTS = ompi_wrapper_script
+if OMPI_WANT_JAVA_BINDINGS
+bin_SCRIPTS += mpijavac.pl
+endif
 CLEANFILES += $(bin_SCRIPTS)
 
 install-exec-hook-always:
@@ -37,7 +46,9 @@ install-exec-hook-always:
 	(cd $(DESTDIR)$(bindir); rm -f mpifort; $(LN_S) ompi_wrapper_script mpifort)
 	(cd $(DESTDIR)$(bindir); rm -f mpif77; $(LN_S) mpifort mpif77)
 	(cd $(DESTDIR)$(bindir); rm -f mpif90; $(LN_S) mpifort mpif90)
+if OMPI_WANT_JAVA_BINDINGS
 	(cd $(DESTDIR)$(bindir); chmod +x mpijavac.pl; rm -f mpijavac; $(LN_S) mpijavac.pl mpijavac)
+endif
 
 uninstall-local-always:
 	rm -f $(DESTDIR)$(bindir)/mpicc \
@@ -45,8 +56,10 @@ uninstall-local-always:
 	$(DESTDIR)$(bindir)/mpicxx \
 	$(DESTDIR)$(bindir)/mpifort \
 	$(DESTDIR)$(bindir)/mpif77 \
-	$(DESTDIR)$(bindir)/mpif90 \
-	$(DESTDIR)$(bindir)/mpijavac
+if OMPI_WANT_JAVA_BINDINGS
+	$(DESTDIR)$(bindir)/mpijavac \
+endif
+	$(DESTDIR)$(bindir)/mpif90
 
 if CASE_SENSITIVE_FS
 install-exec-hook: install-exec-hook-always
@@ -65,6 +78,10 @@ if OMPI_INSTALL_BINARIES
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = ompi.pc ompi-c.pc ompi-cxx.pc ompi-fort.pc
 
+if OMPI_WANT_JAVA_BINDINGS
+bin_SCRIPTS = mpijavac.pl
+endif
+
 man_MANS = $(man_pages)
 
 nodist_pkgdata_DATA = \
@@ -81,7 +98,9 @@ install-exec-hook-always:
 	(cd $(DESTDIR)$(bindir); rm -f mpifort$(EXEEXT); $(LN_S) opal_wrapper mpifort)
 	(cd $(DESTDIR)$(bindir); rm -f mpif77$(EXEEXT); $(LN_S) mpifort mpif77)
 	(cd $(DESTDIR)$(bindir); rm -f mpif90$(EXEEXT); $(LN_S) mpifort mpif90)
+if OMPI_WANT_JAVA_BINDINGS
 	(cd $(DESTDIR)$(bindir); chmod +x mpijavac.pl; rm -f mpijavac; $(LN_S) mpijavac.pl mpijavac)
+endif
 
 install-data-hook-always:
 	(cd $(DESTDIR)$(pkgdatadir); rm -f mpicxx-wrapper-data.txt; $(LN_S) mpic++-wrapper-data.txt mpicxx-wrapper-data.txt)
@@ -102,9 +121,11 @@ uninstall-local-always:
 	$(DESTDIR)$(pkgdatadir)/mpif90-wrapper-data.txt \
 	$(DESTDIR)$(pkgconfigdir)/ompi-f77.pc \
 	$(DESTDIR)$(pkgconfigdir)/ompi-f90.pc \
-	$(DESTDIR)$(pkgconfigdir)/ompi-fort.pc \
+if OMPI_WANT_JAVA_BINDINGS
 	$(DESTDIR)$(bindir)/mpijavac \
-	$(DESTDIR)$(bindir)/mpijavac.pl
+	$(DESTDIR)$(bindir)/mpijavac.pl \
+endif
+	$(DESTDIR)$(pkgconfigdir)/ompi-fort.pc
 
 if CASE_SENSITIVE_FS
 install-exec-hook: install-exec-hook-always