diff --git a/fds/6.7.6.spec b/fds/6.7.6.spec
index c2a7466..27dba30 100644
--- a/fds/6.7.6.spec
+++ b/fds/6.7.6.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %global arch_suffix _64
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string mpi_gnu_linux
@@ -13,7 +13,7 @@
 %global intelmpi_build_command \
  dir=$(pwd) \
  target=${dir##*/} \
- make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
+ make  FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \
diff --git a/fds/6.7.7.spec b/fds/6.7.7.spec
index c2a7466..19bb0f9 100644
--- a/fds/6.7.7.spec
+++ b/fds/6.7.7.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %global arch_suffix _64
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string mpi_gnu_linux
diff --git a/fds/6.7.8.spec b/fds/6.7.8.spec
index d71e901..7b708d4 100644
--- a/fds/6.7.8.spec
+++ b/fds/6.7.8.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %undefine arch_suffix
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string ompi_gnu_linux
diff --git a/fds/6.7.9.spec b/fds/6.7.9.spec
index d71e901..7b708d4 100644
--- a/fds/6.7.9.spec
+++ b/fds/6.7.9.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %undefine arch_suffix
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string ompi_gnu_linux
diff --git a/fds/6.8.0.spec b/fds/6.8.0.spec
index d71e901..7b708d4 100644
--- a/fds/6.8.0.spec
+++ b/fds/6.8.0.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %undefine arch_suffix
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string ompi_gnu_linux
diff --git a/fds/6.9.0.spec b/fds/6.9.0.spec
index d71e901..7b708d4 100644
--- a/fds/6.9.0.spec
+++ b/fds/6.9.0.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %undefine arch_suffix
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string ompi_gnu_linux
diff --git a/fds/6.9.1.spec b/fds/6.9.1.spec
index d71e901..7b708d4 100644
--- a/fds/6.9.1.spec
+++ b/fds/6.9.1.spec
@@ -1,8 +1,8 @@
 %global version_dir %{this_version}
 %global script_suffix %{version_suffix}
 %undefine arch_suffix
-%{!?build_openmpi:%global build_openmpi 1}
-%{!?build_mpich:%global build_mpich 1}
+%{!?build_openmpi:%global build_openmpi 0}
+%{!?build_mpich:%global build_mpich 0}
 %{!?build_intelmpi:%global build_intelmpi 1}
 %{!?build_docs:%global build_docs 0}
 %global gnu_string ompi_gnu_linux