diff --git a/ompi/mpi/f90/mpi_wtick_f90.f90 b/ompi/mpi/f90/mpi_wtick_f90.f90
deleted file mode 100644
index 874bec6253..0000000000
--- a/ompi/mpi/f90/mpi_wtick_f90.f90
+++ /dev/null
@@ -1,25 +0,0 @@
-!
-! Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-!                         University Research and Technology
-!                         Corporation.  All rights reserved.
-! Copyright (c) 2004-2005 The University of Tennessee and The University
-!                         of Tennessee Research Foundation.  All rights
-!                         reserved.
-! Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-!                         University of Stuttgart.  All rights reserved.
-! Copyright (c) 2004-2005 The Regents of the University of California.
-!                         All rights reserved.
-! Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-! $COPYRIGHT$
-! 
-! Additional copyrights may follow
-! 
-! $HEADER$
-!
-
-function MPI_Wtick()
-  implicit none
-  double precision :: MPI_Wtick, foo
-  call MPI_Wtick_f90(foo)
-  MPI_Wtick = foo
-end function MPI_Wtick
diff --git a/ompi/mpi/f90/mpi_wtime_f90.f90 b/ompi/mpi/f90/mpi_wtime_f90.f90
deleted file mode 100644
index 1f3596a727..0000000000
--- a/ompi/mpi/f90/mpi_wtime_f90.f90
+++ /dev/null
@@ -1,25 +0,0 @@
-!
-! Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-!                         University Research and Technology
-!                         Corporation.  All rights reserved.
-! Copyright (c) 2004-2005 The University of Tennessee and The University
-!                         of Tennessee Research Foundation.  All rights
-!                         reserved.
-! Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-!                         University of Stuttgart.  All rights reserved.
-! Copyright (c) 2004-2005 The Regents of the University of California.
-!                         All rights reserved.
-! Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-! $COPYRIGHT$
-! 
-! Additional copyrights may follow
-! 
-! $HEADER$
-!
-
-function MPI_Wtime()
-  implicit none
-  double precision :: MPI_Wtime, foo
-  call MPI_Wtime_f90(foo)
-  MPI_Wtime = foo
-end function MPI_Wtime
diff --git a/ompi/mpi/f90/scripts/Makefile.am b/ompi/mpi/f90/scripts/Makefile.am
index a868361ca4..cf4bba8f66 100644
--- a/ompi/mpi/f90/scripts/Makefile.am
+++ b/ompi/mpi/f90/scripts/Makefile.am
@@ -98,6 +98,8 @@ noinst_SCRIPTS = \
      mpi_unpack_f90.f90.sh \
      mpi_waitall_f90.f90.sh \
      mpi_waitsome_f90.f90.sh \
-     mpi_win_create_f90.f90.sh
+     mpi_win_create_f90.f90.sh \
+     mpi_wtick_f90.f90.sh \
+     mpi_wtime_f90.f90.sh
 
 EXTRA_DIST = $(noinst_SCRIPTS)
diff --git a/ompi/mpi/f90/scripts/mpi_wtick_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_wtick_f90.f90.sh
new file mode 100755
index 0000000000..ca75b4b063
--- /dev/null
+++ b/ompi/mpi/f90/scripts/mpi_wtick_f90.f90.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This flie was not generated by XML scripts; it was written by hand.
+# It may be generated someday, but at this point, it was simpler to
+# just write it by hand.
+
+. "$1/fortran_kinds.sh"
+
+# This entire file is only generated in small or larger modules.  So
+# if we're not at least small, bail now.
+
+check_size small
+if test "$output" = "0"; then
+    exit 0
+fi
+
+# Ok, we should continue.
+
+cat <<EOF
+
+function MPI_Wtick()
+  implicit none
+  double precision :: MPI_Wtick, foo
+  call MPI_Wtick_f90(foo)
+  MPI_Wtick = foo
+end function MPI_Wtick
+
+EOF
diff --git a/ompi/mpi/f90/scripts/mpi_wtime_f90.f90.sh b/ompi/mpi/f90/scripts/mpi_wtime_f90.f90.sh
new file mode 100755
index 0000000000..b8eb470b35
--- /dev/null
+++ b/ompi/mpi/f90/scripts/mpi_wtime_f90.f90.sh
@@ -0,0 +1,42 @@
+#! /bin/sh
+
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# This flie was not generated by XML scripts; it was written by hand.
+# It may be generated someday, but at this point, it was simpler to
+# just write it by hand.
+
+. "$1/fortran_kinds.sh"
+
+# This entire file is only generated in small or larger modules.  So
+# if we're not at least small, bail now.
+
+check_size small
+if test "$output" = "0"; then
+    exit 0
+fi
+
+# Ok, we should continue.
+
+cat <<EOF
+
+function MPI_Wtime()
+  implicit none
+  double precision :: MPI_Wtime, foo
+  call MPI_Wtime_f90(foo)
+  MPI_Wtime = foo
+end function MPI_Wtime
+
+EOF