diff --git a/openmpi.spec b/openmpi.spec
index afb281e..377d371 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -22,7 +22,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		1.8.8
-Release:		5%{?dist}
+Release:		5%{?dist}.1
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
 License:		BSD, MIT and Romio
@@ -168,7 +168,14 @@ sed 's#@LIBDIR@#%{_libdir}/%{name}#;
 
 # make the rpm config file
 install -Dpm 644 %{SOURCE4} %{buildroot}/%{macrosdir}/macros.%{namearch}
+
+# Link the fortran module to proper location
 mkdir -p %{buildroot}/%{_fmoddir}/%{name}
+for mod in %{buildroot}%{_libdir}/%{name}/lib/*.mod
+do
+  modname=$(basename $mod)
+  ln -s ../../../%{name}/lib/${modname} %{buildroot}/%{_fmoddir}/%{name}/
+done
 
 # Remove extraneous wrapper link libraries (bug 814798)
 sed -i -e s/-ldl// -e s/-lhwloc// \
@@ -191,7 +198,6 @@ make check
 %dir %{_libdir}/%{name}/lib/openmpi
 %dir %{_mandir}/%{namearch}
 %dir %{_mandir}/%{namearch}/man*
-%dir %{_fmoddir}/%{name}
 %dir %{python2_sitearch}/%{name}
 %{python2_sitearch}/openmpi.pth
 %dir %{python3_sitearch}/%{name}
@@ -232,6 +238,7 @@ make check
 %{_libdir}/%{name}/bin/shmem[cf]*
 %{_libdir}/%{name}/bin/vt*
 %{_includedir}/%{namearch}/*
+%{_fmoddir}/%{name}/
 %{_libdir}/%{name}/lib/*.so
 %{_libdir}/%{name}/lib/lib*.a
 %{_libdir}/%{name}/lib/*.mod
@@ -257,6 +264,9 @@ make check
 
 
 %changelog
+* Tue Dec 29 2015 Orion Poplawski <orion@cora.nwra.com> - 1.8.8-5.1
+- Fixup fortran module install (bug #1154982)
+
 * Thu Aug 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.8.8-5
 - Use .pth files to set the python path (https://fedorahosted.org/fpc/ticket/563)