diff --git a/ompi/contrib/vt/configure.m4 b/ompi/contrib/vt/configure.m4
index 0cf63dca61..3486b48725 100644
--- a/ompi/contrib/vt/configure.m4
+++ b/ompi/contrib/vt/configure.m4
@@ -153,8 +153,7 @@ AC_DEFUN([OMPI_contrib_vt_CONFIG],[
                ompi/contrib/vt/wrappers/Makefile
                ompi/contrib/vt/wrappers/mpicc-vt-wrapper-data.txt
                ompi/contrib/vt/wrappers/mpic++-vt-wrapper-data.txt
-               ompi/contrib/vt/wrappers/mpif77-vt-wrapper-data.txt
-               ompi/contrib/vt/wrappers/mpif90-vt-wrapper-data.txt
+               ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt
            ])],
           [$2])
 ])dnl
diff --git a/ompi/contrib/vt/wrappers/Makefile.am b/ompi/contrib/vt/wrappers/Makefile.am
index 3a3d55a128..9d3d75ec72 100644
--- a/ompi/contrib/vt/wrappers/Makefile.am
+++ b/ompi/contrib/vt/wrappers/Makefile.am
@@ -23,26 +23,31 @@ if OMPI_INSTALL_BINARIES
 dist_pkgdata_DATA = \
         mpicc-vt-wrapper-data.txt \
 	mpic++-vt-wrapper-data.txt \
-	mpif77-vt-wrapper-data.txt \
-	mpif90-vt-wrapper-data.txt
+	mpifort-vt-wrapper-data.txt
 
 install-exec-hook-always:
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	(cd $(DESTDIR)$(bindir); rm -f mpicc-vt$(EXEEXT); $(LN_S) opal_wrapper mpicc-vt)
 	(cd $(DESTDIR)$(bindir); rm -f mpic++-vt$(EXEEXT); $(LN_S) opal_wrapper mpic++-vt)
 	(cd $(DESTDIR)$(bindir); rm -f mpicxx-vt$(EXEEXT); $(LN_S) opal_wrapper mpicxx-vt)
-	(cd $(DESTDIR)$(bindir); rm -f mpif77-vt$(EXEEXT); $(LN_S) opal_wrapper mpif77-vt)
-	(cd $(DESTDIR)$(bindir); rm -f mpif90-vt$(EXEEXT); $(LN_S) opal_wrapper mpif90-vt)
+	(cd $(DESTDIR)$(bindir); rm -f mpifort-vt$(EXEEXT); $(LN_S) opal_wrapper mpifort-vt)
+	(cd $(DESTDIR)$(bindir); rm -f mpif77-vt$(EXEEXT); $(LN_S) mpifort-vt mpif77-vt)
+	(cd $(DESTDIR)$(bindir); rm -f mpif90-vt$(EXEEXT); $(LN_S) mpifort-vt mpif90-vt)
 
 install-data-hook-always:
 	(cd $(DESTDIR)$(pkgdatadir); rm -f mpicxx-vt-wrapper-data.txt; $(LN_S) mpic++-vt-wrapper-data.txt mpicxx-vt-wrapper-data.txt)
+	(cd $(DESTDIR)$(pkgdatadir); rm -f mpif77-vt-wrapper-data.txt; $(LN_S) mpifort-wrapper-data.txt mpif77-vt-wrapper-data.txt)
+	(cd $(DESTDIR)$(pkgdatadir); rm -f mpif90-vt-wrapper-data.txt; $(LN_S) mpifort-wrapper-data.txt mpif90-vt-wrapper-data.txt)
 
 uninstall-local-always:
 	rm -f $(DESTDIR)$(bindir)/mpicc-vt$(EXEEXT) \
 	$(DESTDIR)$(bindir)/mpic++-vt$(EXEEXT) \
 	$(DESTDIR)$(bindir)/mpicxx-vt$(EXEEXT) \
+	$(DESTDIR)$(bindir)/mpifort-vt$(EXEEXT) \
 	$(DESTDIR)$(bindir)/mpif77-vt$(EXEEXT) \
 	$(DESTDIR)$(bindir)/mpif90-vt$(EXEEXT) \
+	$(DESTDIR)$(pkgdatadir)/mpif77-vt-wrapper-data.txt \
+	$(DESTDIR)$(pkgdatadir)/mpif90-vt-wrapper-data.txt \
 	$(DESTDIR)$(pkgdatadir)/mpicxx-vt-wrapper-data.txt
 
 if CASE_SENSITIVE_FS
diff --git a/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in b/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in
new file mode 100644
index 0000000000..5eac9108a3
--- /dev/null
+++ b/ompi/contrib/vt/wrappers/mpifort-vt-wrapper-data.txt.in
@@ -0,0 +1,23 @@
+# There can be multiple blocks of configuration data, chosen by
+# compiler flags (using the compiler_args key to chose which block
+# should be activated.  This can be useful for multilib builds.  See the
+# multilib page at:
+#    https://svn.open-mpi.org/trac/ompi/wiki/compilerwrapper3264 
+# for more information.
+
+project=Open MPI
+project_short=OMPI
+version=@OMPI_VERSION@
+language=Fortran
+compiler_env=FC
+compiler_flags_env=FCFLAGS
+compiler=@FC@
+module_option=@OMPI_FC_MODULE_FLAG@
+extra_includes=
+preprocessor_flags=
+compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@ 
+linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
+libs=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@
+includedir=${includedir}
+libdir=${libdir}