diff --git a/.gitignore b/.gitignore
index 68a3d06..832f401 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mpich-3.0.4.tar.gz
 /mpich-3.1.tar.gz
+/mpich-3.1.4.tar.gz
diff --git a/mpich.spec b/mpich.spec
index 97faa73..d4e7529 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -2,8 +2,8 @@
 
 Summary:	A high-performance implementation of MPI
 Name:		mpich
-Version:	3.1
-Release:	4%{?dist}
+Version:	3.1.4
+Release:	1%{?dist}
 License:	MIT
 Group:		Development/Libraries
 URL:		http://www.mpich.org/
@@ -117,8 +117,10 @@ Contains documentations, examples and man-pages for mpich
 %configure	\
 	--enable-sharedlibs=gcc					\
 	--enable-shared						\
+	--enable-static=no						\
 	--enable-lib-depend					\
 	--disable-rpath						\
+	--disable-silent-rules					\
 	--enable-fc						\
 	--with-device=%{selected_channels}			\
 	--with-pm=hydra:gforker					\
@@ -158,9 +160,6 @@ make %{?_smp_mflags} VERBOSE=1
 %install
 make DESTDIR=%{buildroot} install
 
-mv %{buildroot}%{_libdir}/%{name}/lib/pkgconfig %{buildroot}%{_libdir}/
-chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
-
 #mkdir -p %{buildroot}/%{_fmoddir}/%{name}
 #mv  %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/
 
@@ -169,7 +168,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
 mkdir -p %{buildroot}%{python_sitearch}/%{name}
 cp -pr src/packaging/envmods/mpich.module %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
 sed -i 's#'%{_bindir}'#'%{_libdir}/%{name}/bin'#;s#@LIBDIR@#'%{_libdir}'#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
-cp -p %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch} %{buildroot}%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh
@@ -183,7 +181,6 @@ mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
 cp -p %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
 
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-rm -f %{buildroot}%{_libdir}/%{name}/lib/lib{*mpich*,opa,mpl}.a
 
 %check
 make check
@@ -203,17 +200,15 @@ make check
 %dir %{_mandir}/%{name}
 %doc %{_mandir}/%{name}/man1/
 %{_sysconfdir}/modulefiles/mpi/
-%{_sysconfdir}/modulefiles/%{name}-%{_arch}
 
 %files autoload
 %{_sysconfdir}/profile.d/mpich-%{_arch}.*
 
 %files devel
 %{_includedir}/%{name}-%{_arch}/
+%{_libdir}/%{name}/lib/pkgconfig/
 ##%{_fmoddir}/%{name}/
 %{_libdir}/%{name}/lib/*.so
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/pkgconfig/openpa.pc
 %{_rpmconfigdir}/macros.d/macros.%{name}
 
 %files doc
@@ -222,6 +217,11 @@ make check
 %{_mandir}/%{name}/man3/
 
 %changelog
+* Wed Mar 11 2015 Orion Poplawski <orion@cora.nwra.com> - 3.1.4-1
+- Update to 3.1.4
+- Own and set PKG_CONFIG_DIR (bug #1113627)
+- Do not ship old modulefile location (bug #921534)
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index e346b4b..a13bab3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5643dd176499bfb7d25079aaff25f2ec  mpich-3.1.tar.gz
+2ab544607986486562e076b83937bba2  mpich-3.1.4.tar.gz