diff --git a/mpich.spec b/mpich.spec
index 505250a..fb85050 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -88,7 +88,7 @@ Contains documentations, examples and man-pages for mpich
 # so uncomment and undefine to NOT use
 %{!?opt_cc_cflags: %global opt_cc_cflags %{optflags}}
 %{!?opt_fc_fflags: %global opt_fc_fflags %{optflags}}
-#%{!?opt_fc_fflags: %global opt_fc_fflags %{optflags} -I%{_fmoddir}}
+#%%{!?opt_fc_fflags: %%global opt_fc_fflags %%{optflags} -I%%{_fmoddir}}
 %{!?opt_f77_fflags: %global opt_f77_fflags %{optflags}}
 
 %ifarch s390
@@ -112,14 +112,13 @@ Contains documentations, examples and man-pages for mpich
 %endif
 
 %prep
-%setup -q
-%patch0 -p0 -b .modu
+%autosetup -p0
 
 %build
 %configure	\
 	--enable-sharedlibs=gcc					\
 	--enable-shared						\
-	--enable-static=no						\
+	--enable-static=no					\
 	--enable-lib-depend					\
 	--disable-rpath						\
 	--disable-silent-rules					\
@@ -167,9 +166,13 @@ make DESTDIR=%{buildroot} install
 
 # Install the module file
 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}/%{name}'#;s#@MPINAME@#%{name}#;s#@pysitearch@#'%{python_sitearch}'#;s#@ARCH@#'%{_arch}'#' %{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
+sed 's#%{_bindir}#%{_libdir}/%{name}/bin#;
+     s#@LIBDIR@#%{_libdir}/%{name}#;
+     s#@MPINAME@#%{name}#;
+     s#@pysitearch@#%{python_sitearch}#;
+     s#@ARCH@#%{_arch}#' \
+     <src/packaging/envmods/mpich.module \
+     >%{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
 
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh
@@ -179,10 +182,11 @@ EOF
 cp -p %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.{sh,csh}
  
 # Install the RPM macros
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
-cp -p %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
+install -pDm0644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
 
-find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+mkdir -p %{buildroot}%{python_sitearch}/%{name}
+
+find %{buildroot} -type f -name "*.la" -delete
 
 %check
 make check VERBOSE=1
@@ -192,7 +196,8 @@ make check VERBOSE=1
 %postun -p /sbin/ldconfig
 
 %files
-%doc CHANGES COPYRIGHT README README.envvar RELEASE_NOTES
+%license COPYRIGHT
+%doc CHANGES README README.envvar RELEASE_NOTES
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/lib
 %dir %{_libdir}/%{name}/bin
@@ -209,7 +214,7 @@ make check VERBOSE=1
 %files devel
 %{_includedir}/%{name}-%{_arch}/
 %{_libdir}/%{name}/lib/pkgconfig/
-##%{_fmoddir}/%{name}/
+##%%{_fmoddir}/%%{name}/
 %{_libdir}/%{name}/lib/*.so
 %{_rpmconfigdir}/macros.d/macros.%{name}
 
@@ -219,6 +224,9 @@ make check VERBOSE=1
 %{_mandir}/%{name}/man3/
 
 %changelog
+* Thu Aug 27 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-6
+- Cleanups to the spec file
+
 * Sun Jul 26 2015 Sandro Mani <manisandro@gmail.com> - 3.1.4-5
 - Require, BuildRequire: rpm-mpi-hooks