diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4
index ef60217aff..f436bcabb7 100644
--- a/config/ompi_configure_options.m4
+++ b/config/ompi_configure_options.m4
@@ -194,10 +194,13 @@ AC_ARG_ENABLE(mpi-profile,
 if test "$enable_mpi_profile" != "no"; then
     AC_MSG_RESULT([yes])
     WANT_MPI_PROFILING=1
+    MPIF_H_PMPI_W_FUNCS=", PMPI_WTICK, PMPI_WTIME"
 else
     AC_MSG_RESULT([no])
     WANT_MPI_PROFILING=0
+    MPIF_H_PMPI_W_FUNCS=
 fi
+AC_SUBST(MPIF_H_PMPI_W_FUNCS)
 
 
 #                                                                              
diff --git a/include/mpif.h.in b/include/mpif.h.in
index 448995d2be..fbf0523be0 100644
--- a/include/mpif.h.in
+++ b/include/mpif.h.in
@@ -446,5 +446,5 @@
 !
 ! double precision functions
 !
-      double precision MPI_WTIME, MPI_WTICK, PMPI_WTIME, PMPI_WTICK
-      external MPI_WTIME, MPI_WTICK, PMPI_WTIME, PMPI_WTICK
+      double precision MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@
+      external MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@