diff --git a/.gitignore b/.gitignore
index f3f3632..ca51393 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ fftw-3.2.2.tar.gz
 >>>>>>> master
 /fftw-3.3.4.tar.gz
 /fftw-3.3.5.tar.gz
+/fftw-3.3.8.tar.gz
diff --git a/fftw.spec b/fftw.spec
index 1cd67d1..29ac9ae 100644
--- a/fftw.spec
+++ b/fftw.spec
@@ -13,8 +13,8 @@
 
 
 Name:           fftw
-Version:        3.3.5
-Release:        11%{?dist}
+Version:        3.3.8
+Release:        1%{?dist}
 Summary:        A Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -43,6 +43,9 @@ BuildRequires:  nss-myhostname
 %if %{with openmpi}
 BuildRequires:  openmpi-devel
 %endif
+%if %{with mpich} || %{with openmpi}
+BuildRequires:  environment-modules
+%endif
 
 Requires(post): info 
 Requires(preun): info
@@ -291,6 +294,10 @@ library.
 %setup -q
 
 %build
+# Explicitly load shell support for the environment-modules package, used
+# below via 'module' pseudo-command.
+source /etc/profile.d/modules.sh
+
 # Regenerate autoconf files using current tools so proper build flags
 # from redhat-rpm-config are used
 autoreconf -vfi
@@ -378,6 +385,10 @@ done
 
 
 %install
+# Explicitly load shell support for the environment-modules package, used
+# below via 'module' pseudo-command.
+source /etc/profile.d/modules.sh
+
 %if %{quad}
 for ver in single double long quad
 %else
@@ -403,6 +414,10 @@ rm -f %{buildroot}%{_infodir}/dir
 find %{buildroot} -name \*.la -delete
 
 %check
+# Explicitly load shell support for the environment-modules package, used
+# below via 'module' pseudo-command.
+source /etc/profile.d/modules.sh
+
 bdir=`pwd`
 %if %{quad}
 for ver in single double long quad
@@ -487,6 +502,8 @@ fi
 %doc doc/FAQ/fftw-faq.html/
 %doc %{_infodir}/fftw3.info*
 %{_includedir}/fftw3*
+%dir %{_libdir}/cmake/fftw3/
+%{_libdir}/cmake/fftw3/*.cmake
 %{_libdir}/pkgconfig/fftw3*.pc
 %{_libdir}/libfftw3*.so
 
@@ -517,6 +534,8 @@ fi
 %files mpich-devel
 %doc doc/FAQ/fftw-faq.html/
 %{_includedir}/mpich-%{_arch}
+%dir %{_libdir}/mpich/lib/cmake/fftw3/
+%{_libdir}/mpich/lib/cmake/fftw3/*.cmake
 %{_libdir}/mpich/lib/pkgconfig/fftw3*.pc
 %{_libdir}/mpich/lib/libfftw3*.so
 
@@ -545,6 +564,8 @@ fi
 %files openmpi-devel
 %doc doc/FAQ/fftw-faq.html/
 %{_includedir}/openmpi-%{_arch}
+%dir %{_libdir}/openmpi/lib/cmake/fftw3/
+%{_libdir}/openmpi/lib/cmake/fftw3/*.cmake
 %{_libdir}/openmpi/lib/pkgconfig/fftw3*.pc
 %{_libdir}/openmpi/lib/libfftw3*.so
 
@@ -553,6 +574,12 @@ fi
 %endif
 
 %changelog
+* Mon Jun 11 2018 Conrad Meyer <cemeyer@uw.edu> - 3.3.8-1
+- Update to latest upstream, 3.3.8 (rhbz# 1413425)
+- Add missing BuildRequires on environment-modules, used in 43b91c1c ("Build
+  mpich and openmpi versions") without explicit BR dependency
+- Add new cmake files to %%files
+
 * Wed Apr 18 2018 Merlin Mathesius <mmathesi@redhat.com> - 3.3.5-11
 - Regenerate autoconf files using current tools so proper build flags
   from redhat-rpm-config are used. This resolves BZ#1548473.
diff --git a/sources b/sources
index eb36f1f..6c02665 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6cc08a3b9c7ee06fdd5b9eb02e06f569  fftw-3.3.5.tar.gz
+SHA512 (fftw-3.3.8.tar.gz) = ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38