diff --git a/src/mpi/f90/Makefile.am b/src/mpi/f90/Makefile.am
index 3935493c36..4e1494c58a 100644
--- a/src/mpi/f90/Makefile.am
+++ b/src/mpi/f90/Makefile.am
@@ -15,5 +15,112 @@
 
 include $(top_srcdir)/config/Makefile.options
 
-# JMS: Need more stuff here -- only compile if we're making the F90
-# layer (?)
+SUBDIRS = scripts
+
+AM_FCFLAGS = $(FCFLAGS_f90)
+
+lib_LTLIBRARIES =
+if OMPI_WANT_F90_BINDINGS
+lib_LTLIBRARIES += libmpi_f90.la
+else
+lib_LTLIBRARIES +=
+endif
+
+libmpi_f90_la_SOURCES = \
+    mpi.f90
+
+nodist_libmpi_f90_la_SOURCES = \
+     mpi_address_f90.f90 \
+     mpi_bcast_f90.f90 \
+     mpi_bsend_f90.f90 \
+     mpi_bsend_init_f90.f90 \
+     mpi_buffer_attach_f90.f90 \
+     mpi_buffer_detach_f90.f90 \
+     mpi_file_iread_f90.f90 \
+     mpi_file_iread_at_f90.f90 \
+     mpi_file_iread_shared_f90.f90 \
+     mpi_file_iwrite_f90.f90 \
+     mpi_file_iwrite_at_f90.f90 \
+     mpi_file_iwrite_shared_f90.f90 \
+     mpi_file_read_f90.f90 \
+     mpi_file_read_all_f90.f90 \
+     mpi_file_read_all_begin_f90.f90 \
+     mpi_file_read_all_end_f90.f90 \
+     mpi_file_read_at_f90.f90 \
+     mpi_file_read_at_all_f90.f90 \
+     mpi_file_read_at_all_begin_f90.f90 \
+     mpi_file_read_at_all_end_f90.f90 \
+     mpi_file_read_ordered_f90.f90 \
+     mpi_file_read_ordered_begin_f90.f90 \
+     mpi_file_read_ordered_end_f90.f90 \
+     mpi_file_read_shared_f90.f90 \
+     mpi_file_write_f90.f90 \
+     mpi_file_write_all_f90.f90 \
+     mpi_file_write_all_begin_f90.f90 \
+     mpi_file_write_all_end_f90.f90 \
+     mpi_file_write_at_f90.f90 \
+     mpi_file_write_at_all_f90.f90 \
+     mpi_file_write_at_all_begin_f90.f90 \
+     mpi_file_write_at_all_end_f90.f90 \
+     mpi_file_write_ordered_f90.f90 \
+     mpi_file_write_ordered_begin_f90.f90 \
+     mpi_file_write_ordered_end_f90.f90 \
+     mpi_file_write_shared_f90.f90 \
+     mpi_ibsend_f90.f90 \
+     mpi_irecv_f90.f90 \
+     mpi_irsend_f90.f90 \
+     mpi_isend_f90.f90 \
+     mpi_issend_f90.f90 \
+     mpi_recv_f90.f90 \
+     mpi_recv_init_f90.f90 \
+     mpi_rsend_f90.f90 \
+     mpi_rsend_init_f90.f90 \
+     mpi_send_f90.f90 \
+     mpi_send_init_f90.f90 \
+     mpi_sendrecv_replace_f90.f90 \
+     mpi_ssend_f90.f90 \
+     mpi_ssend_init_f90.f90
+
+if WANT_MPI2_ONE_SIDED
+nodist_libmpi_f90_la_SOURCES += \
+     mpi_accumulate_f90.f90 \
+     mpi_get_f90.f90 \
+     mpi_put_f90.f90 \
+     mpi_win_create_f90.f90
+endif
+
+#        win_call_errhandler_f.c \
+#        win_complete_f.c \
+#        win_create_errhandler_f.c \
+#        win_create_f.c \
+#        win_create_keyval_f.c \
+#        win_delete_attr_f.c \
+#        win_fence_f.c \
+#        win_free_f.c \
+#        win_free_keyval_f.c \
+#        win_get_attr_f.c \
+#        win_get_errhandler_f.c \
+#        win_get_group_f.c \
+#        win_get_name_f.c \
+#        win_lock_f.c \
+#        win_post_f.c \
+#        win_set_attr_f.c \
+#        win_set_errhandler_f.c \
+#        win_set_name_f.c \
+#        win_start_f.c \
+#        win_test_f.c \
+#        win_unlock_f.c \
+#        win_wait_f.c
+
+
+#
+# Sym link in the sources from the real MPI directory
+#
+$(nodist_libmpi_f90_la_SOURCES):
+	if test ! -r $@ ; then \
+	    scripts/$@.sh > $@ ; \
+	fi
+
+MOSTLYCLEANFILES = *.mod
+
+DISTCLEANFILES = $(nodist_libmpi_f90_la_SOURCES)