diff --git a/configure.ac b/configure.ac
index 173a5d6063..35971a4a6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1107,6 +1107,7 @@ AC_CONFIG_FILES([
     ompi/Makefile
     ompi/etc/Makefile
     ompi/include/Makefile
+    ompi/include/mpif.h
     ompi/include/mpif-config.h
 
     ompi/datatype/Makefile
diff --git a/ompi/include/mpif.h b/ompi/include/mpif.h.in
similarity index 96%
rename from ompi/include/mpif.h
rename to ompi/include/mpif.h.in
index 8e6a80363d..014ca932e7 100644
--- a/ompi/include/mpif.h
+++ b/ompi/include/mpif.h.in
@@ -74,6 +74,6 @@
 !     
 !     double precision functions
 !     
-      external MPI_WTIME, MPI_WTICK
-      double precision MPI_WTIME, MPI_WTICK
+      external MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@
+      double precision MPI_WTIME, MPI_WTICK @MPIF_H_PMPI_W_FUNCS@