diff --git a/mpich.spec b/mpich.spec
index 483d3ba..4ca17e5 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:        9%{?dist}
+Release:        10%{?dist}
 License:        MIT
 URL:            http://www.mpich.org/
 
@@ -94,75 +94,31 @@ Summary:        mpich support for Python 3
 %description -n python3-mpich
 mpich support for Python 3.
 
-# We only compile with gcc, but other people may want other compilers.
-# Set the compiler here.
-%{!?opt_cc: %global opt_cc gcc}
-%{!?opt_fc: %global opt_fc gfortran}
-%{!?opt_f77: %global opt_f77 gfortran}
-# Optional CFLAGS to use with the specific compiler...gcc doesn't need any,
-# 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_f77_fflags: %global opt_f77_fflags %{optflags}}
-
-%ifarch s390
-%global m_option -m31
-%else
-%global m_option -m%{__isa_bits}
-%endif
-
-%ifarch %{arm} aarch64 %{mips}
-%global m_option ""
-%endif
-
-%global selected_channels ch3:nemesis
-
-%ifarch %{ix86} x86_64 s390 %{arm} aarch64
-%global XFLAGS -fPIC
-%endif
-
 %prep
 %autosetup -p1
 
 %build
-%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                                 \
-        --includedir=%{_includedir}/%{name}-%{_arch}            \
-        --bindir=%{_libdir}/%{name}/bin                         \
-        --libdir=%{_libdir}/%{name}/lib                         \
-        --datadir=%{_datadir}/%{name}                           \
-        --mandir=%{_mandir}/%{name}-%{_arch}                    \
-        --docdir=%{_datadir}/%{name}/doc                        \
-        --htmldir=%{_datadir}/%{name}/doc                       \
-        --with-hwloc-prefix=system                              \
-        FC=%{opt_fc}                                            \
-        F77=%{opt_f77}                                          \
-        CFLAGS="%{m_option} -O2 %{?XFLAGS}"                     \
-        CXXFLAGS="%{m_option} -O2 %{?XFLAGS}"                   \
-        FCFLAGS="%{m_option} -O2 %{?XFLAGS}"                    \
-        FFLAGS="%{m_option} -O2 %{?XFLAGS}"                     \
-        LDFLAGS='-Wl,-z,noexecstack'                            \
-        MPICHLIB_CFLAGS="%{?opt_cc_cflags}"                     \
-        MPICHLIB_CXXFLAGS="%{optflags}"                         \
-        MPICHLIB_FCFLAGS="%{?opt_fc_fflags}"                    \
-        MPICHLIB_FFLAGS="%{?opt_f77_fflags}"
-#       MPICHLIB_LDFLAGS='-Wl,-z,noexecstack'                   \
-#       MPICH_MPICC_FLAGS="%{m_option} -O2 %{?XFLAGS}"  \
-#       MPICH_MPICXX_FLAGS="%{m_option} -O2 %{?XFLAGS}" \
-#       MPICH_MPIFC_FLAGS="%{m_option} -O2 %{?XFLAGS}"  \
-#       MPICH_MPIF77_FLAGS="%{m_option} -O2 %{?XFLAGS}"
-#       --with-openpa-prefix=embedded                           \
+CONFIGURE_OPTS=(
+        --enable-sharedlibs=gcc
+        --enable-shared
+        --enable-static=no
+        --enable-lib-depend
+        --disable-rpath
+        --disable-silent-rules
+        --enable-fc
+        --with-device=ch3:nemesis
+        --with-pm=hydra:gforker
+        --includedir=%{_includedir}/%{name}-%{_arch}
+        --bindir=%{_libdir}/%{name}/bin
+        --libdir=%{_libdir}/%{name}/lib
+        --datadir=%{_datadir}/%{name}
+        --mandir=%{_mandir}/%{name}-%{_arch}
+        --docdir=%{_datadir}/%{name}/doc
+        --htmldir=%{_datadir}/%{name}/doc
+        --with-hwloc-prefix=system
+)
 
-#       FCFLAGS="%{?opt_fc_fflags} -I%{_fmoddir}/%{name} %{?XFLAGS}"    \
+%configure "${CONFIGURE_OPTS[@]}"
 
 # Remove rpath
 sed -r -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -263,6 +219,9 @@ make check VERBOSE=1
 %{python3_sitearch}/%{name}.pth
 
 %changelog
+* Tue May  7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.2.1-10
+- Drop all custom compilation and link flags (#1573088)
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild