diff -Nrup a/src/cpp/server/extras/systemd/rstudio-server.redhat.service.in b/src/cpp/server/extras/systemd/rstudio-server.redhat.service.in
--- a/src/cpp/server/extras/systemd/rstudio-server.redhat.service.in	2019-12-04 07:22:17.000000000 +0100
+++ b/src/cpp/server/extras/systemd/rstudio-server.redhat.service.in	2020-01-06 18:33:50.403209617 +0100
@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/rstudio-server.pid
+PIDFile=/run/rstudio-server/rstudio-server.pid
 ExecStart=${CMAKE_INSTALL_PREFIX}/bin/rserver
 ExecStop=/usr/bin/killall -TERM rserver
 KillMode=none
diff -Nrup a/src/cpp/server/extras/systemd/rstudio-server.service.in b/src/cpp/server/extras/systemd/rstudio-server.service.in
--- a/src/cpp/server/extras/systemd/rstudio-server.service.in	2019-12-04 07:22:17.000000000 +0100
+++ b/src/cpp/server/extras/systemd/rstudio-server.service.in	2020-01-06 18:33:28.341027347 +0100
@@ -5,7 +5,7 @@ Wants=network-online.target
 
 [Service]
 Type=forking
-PIDFile=/var/run/rstudio-server.pid
+PIDFile=/run/rstudio-server/rstudio-server.pid
 ExecStart=${CMAKE_INSTALL_PREFIX}/bin/rserver
 ExecStop=/usr/bin/killall -TERM rserver
 KillMode=none
diff -Nrup a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp
--- a/src/cpp/server/ServerOptions.cpp	2019-12-04 07:22:17.000000000 +0100
+++ b/src/cpp/server/ServerOptions.cpp	2020-01-06 18:36:14.492387133 +0100
@@ -197,7 +197,7 @@ ProgramStatus Options::read(int argc,
                                       core::system::effectiveUserIsRoot()),
          "run program as daemon")
       ("server-pid-file",
-         value<std::string>(&serverPidFile_)->default_value("/var/run/rstudio-server.pid"),
+         value<std::string>(&serverPidFile_)->default_value("/run/rstudio-server/rstudio-server.pid"),
          "location of pid file to write (only in daemon mode)")
       ("server-app-armor-enabled",
         value<bool>(&serverAppArmorEnabled_)->default_value(0),