diff --git a/openhpi-3.4.0-systemd.patch b/openhpi-3.4.0-systemd.patch
index 69dd981..ad25d4b 100644
--- a/openhpi-3.4.0-systemd.patch
+++ b/openhpi-3.4.0-systemd.patch
@@ -83,7 +83,7 @@ Index: openhpi-3.8.0/openhpid/openhpid.service.in
 +
 +[Service]
 +Type=forking
-+PIDFile=/var/run/openhpid.pid
++PIDFile=/run/openhpid.pid
 +ExecStart=@sbindir@/openhpid -c @sysconfdir@/openhpi/openhpi.conf
 +
 +[Install]
diff --git a/openhpi.changes b/openhpi.changes
index 95c380d..0b9e832 100644
--- a/openhpi.changes
+++ b/openhpi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 27 14:26:51 UTC 2021 - Thomas Renninger <trenn@suse.de>
+
+- Use /run not /var/run for PID file creation (bsc#1185173)
+
 -------------------------------------------------------------------
 Thu Oct  4 18:56:16 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/openhpi.spec b/openhpi.spec
index 526b17a..1103aa7 100644
--- a/openhpi.spec
+++ b/openhpi.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openhpi
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -76,11 +76,11 @@ Requires:       e2fsprogs-devel
 Requires:       gdbm-devel
 Requires:       glib2-devel
 Requires:       glibc-devel
+Requires:       libopenhpi4 = %{version}
 Requires:       libstdc++-devel
 Requires:       libtool
 Requires:       ncurses-devel
 Requires:       net-snmp-devel
-Requires:       libopenhpi4 = %{version}
 Requires:       openssl-devel
 Requires:       popt-devel
 Requires:       zlib-devel