diff --git a/mpich.spec b/mpich.spec
index ddd027f..26dc38c 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,7 +1,7 @@
 Summary:        A high-performance implementation of MPI
 Name:           mpich
 Version:        3.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mpich.org/
 
@@ -175,8 +175,9 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 %install
 %make_install
 
-mkdir -p %{buildroot}/%{_fmoddir}/%{name}
-mv  %{buildroot}%{_includedir}/%{name}-*/*.mod %{buildroot}/%{_fmoddir}/%{name}/
+mkdir -p %{buildroot}%{_fmoddir}/%{name}
+mv  %{buildroot}%{_includedir}/%{name}-*/*.mod %{buildroot}%{_fmoddir}/%{name}/
+sed -r -i 's|^modincdir=.*|modincdir=%{_fmoddir}/%{name}|' %{buildroot}%{_libdir}/%{name}/bin/mpifort
 
 # Install the module file
 mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
@@ -223,7 +224,12 @@ make check VERBOSE=1
 %dir %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/bin
 %{_libdir}/%{name}/lib/*.so.*
-%{_libdir}/%{name}/bin/*
+%{_libdir}/%{name}/bin/hydra*
+%{_libdir}/%{name}/bin/mpichversion
+%{_libdir}/%{name}/bin/mpiexec*
+%{_libdir}/%{name}/bin/mpirun
+%{_libdir}/%{name}/bin/mpivars
+%{_libdir}/%{name}/bin/parkill
 %dir %{_mandir}/%{name}-%{_arch}
 %doc %{_mandir}/%{name}-%{_arch}/man1/
 %{_sysconfdir}/modulefiles/mpi/
@@ -235,6 +241,12 @@ make check VERBOSE=1
 %{_includedir}/%{name}-%{_arch}/
 %{_libdir}/%{name}/lib/pkgconfig/
 %{_libdir}/%{name}/lib/*.so
+%{_libdir}/%{name}/bin/mpicc
+%{_libdir}/%{name}/bin/mpic++
+%{_libdir}/%{name}/bin/mpicxx
+%{_libdir}/%{name}/bin/mpif77
+%{_libdir}/%{name}/bin/mpif90
+%{_libdir}/%{name}/bin/mpifort
 %{_fmoddir}/%{name}/
 %{_rpmconfigdir}/macros.d/macros.%{name}
 %{_mandir}/%{name}-%{_arch}/man3/
@@ -252,6 +264,10 @@ make check VERBOSE=1
 %{python3_sitearch}/%{name}.pth
 
 %changelog
+* Sun Nov 12 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-2
+- Update $modincdir in mpifort after moving .mod files (#1301533)
+- Move compiler wrappers to mpich-devel (#1353621)
+
 * Sun Nov 12 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-1
 - Update to latest bugfix release (#1512188)