diff --git a/slurm.changes b/slurm.changes
index d11ed76..003ecfa 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Sep 11 10:55:25 UTC 2019 - Egbert Eich <eich@suse.com>
+
+- Edit sample configuration to deprecate "ControlMachine",
+  "ControlAddr", "BackupController" and "BackupAddr" in favor
+  "SlurmctldHost".
+
 -------------------------------------------------------------------
 Sat Aug 17 14:20:35 UTC 2019 - Egbert Eich <eich@suse.com>
 
diff --git a/slurm.spec b/slurm.spec
index 31d332d..a085268 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -541,6 +541,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
+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
 cat >>%{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf <<EOF 
 # SUSE default configuration
 PropagateResourceLimitsExcept=MEMLOCK