diff --git a/slurm.changes b/slurm.changes
index e4a8374..788173e 100644
--- a/slurm.changes
+++ b/slurm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep 22 06:09:18 UTC 2018 - eich@suse.com
+
+- Fix Requires(pre) and Requires(post) for slurm-config and slurm-node.
+  This fixes issues with failing slurm user creation when installed
+  during initial system installation (bsc#1109373).
+
 -------------------------------------------------------------------
 Tue Aug 14 10:26:43 UTC 2018 - eich@suse.com
 
diff --git a/slurm.spec b/slurm.spec
index aa38751..9bb7a1a 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -77,11 +77,6 @@ Patch9:         slurmctld-rerun-agent_init-when-backup-controller-takes-over.pat
 
 Requires:       slurm-config = %{version}
 Requires:       slurm-node = %{version}
-%if 0%{?suse_version} <= 1140
-Requires(pre):  pwdutils
-%else
-Requires(pre):  shadow
-%endif
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gtk2-devel
@@ -111,7 +106,7 @@ BuildRequires:  freeipmi-devel
 %{?systemd_requires}
 BuildRequires:  systemd
 %else
-PreReq:         %insserv_prereq %fillup_prereq
+Requires(post):         %insserv_prereq %fillup_prereq
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Obsoletes:      slurm-sched-wiki < %{version}
@@ -213,7 +208,7 @@ Recommends:     slurm-munge = %{version}
 %if 0%{?with_systemd}
 %{?systemd_requires}
 %else
-PreReq:         %insserv_prereq %fillup_prereq
+Requires(post):         %insserv_prereq %fillup_prereq
 %endif
 Obsoletes:      slurm-sched-wiki < %{version}
 Obsoletes:      slurmdb-direct < %{version} 
@@ -306,6 +301,11 @@ Group:          Productivity/Clustering/Computing
 Requires:       slurm-config = %{version}
 Requires:       slurm-plugins = %{version}
 Recommends:     %{name}-munge
+%if 0%{?with_systemd}
+%{?systemd_requires}
+%else
+Requires(post):         %insserv_prereq %fillup_prereq
+%endif
 
 %description node
 This package contains just the minmal code to run a compute node.
@@ -313,6 +313,14 @@ This package contains just the minmal code to run a compute node.
 %package config
 Summary:        Config files and directories for slurm services
 Group:          Productivity/Clustering/Computing
+%if 0%{?suse_version} <= 1140
+Requires(pre):  pwdutils
+%else
+Requires(pre):  shadow
+%endif
+%if 0%{?with_systemd}
+%{?systemd_requires}
+%endif
 
 %description config
 This package contains the slurm config files necessary direcories