diff --git a/slurm.changes b/slurm.changes
index b359ca5..0db066f 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  5 15:37:05 UTC 2020 - Christian Goll <cgoll@suse.com>
+
+- standard slurm.conf uses now also SlurmctldHost on all build 
+  targets (bsc#1162377)
+
 -------------------------------------------------------------------
 Mon Jan 27 08:42:55 UTC 2020 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 6ac66d7..1961cf0 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -581,13 +581,11 @@ sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#'  %{buildroot}/%
 sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
 sed -i 's#^\(SlurmctldPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmctld.pid#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
 sed -i 's#^\(SlurmdSpoolDir=\)/.*#\1%{_localstatedir}/spool/slurm#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
-%if 0%{?upgrade} || 0%{suse_version} > 1501
 sed -i -e '/^ControlMachine=/i# Ordered List of Control Nodes' \
     -e 's#ControlMachine=\(.*\)$#SlurmctldHost=\1(10.0.10.20)#' \
     -e 's#BackupController=.*#SlurmctldHost=linux1(10.0.10.21)#' \
     -e '/.*ControlAddr=.*/d' \
     -e '/.*BackupAddr=.*/d'  %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf
-%endif
 cat >>%{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf <<EOF 
 # SUSE default configuration
 PropagateResourceLimitsExcept=MEMLOCK