diff --git a/Makefile b/Makefile
index 9162516..08b0950 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,8 @@ install-systemd:
 	install -m 0644 vm-systemd/qubes-core.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
 	install -m 0644 vm-systemd/qubes-misc.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
 	install -m 0755 network/qubes-iptables $(DESTDIR)$(LIBDIR)/qubes/init/
+	install -D -m 0644 vm-systemd/qubes-core-agent-linux.tmpfiles \
+		$(DESTDIR)/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
 
 install-sysvinit:
 	install -d $(DESTDIR)/etc/init.d
diff --git a/network/tinyproxy-updates.conf b/network/tinyproxy-updates.conf
index 2d01015..d4d25e8 100644
--- a/network/tinyproxy-updates.conf
+++ b/network/tinyproxy-updates.conf
@@ -8,7 +8,7 @@ DefaultErrorFile "/usr/share/tinyproxy/default.html"
 StatFile "/usr/share/tinyproxy/stats.html"
 Syslog On
 LogLevel Notice
-PidFile "/var/run/tinyproxy/tinyproxy-updates.pid"
+PidFile "/var/run/tinyproxy-updates/tinyproxy.pid"
 
 MaxClients 50
 MinSpareServers 2
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 5c0e004..31b5af6 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -536,6 +536,7 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/tmp.mount.d/30_qubes.conf
 /lib/systemd/user/pulseaudio.service.d/30_qubes.conf
 /lib/systemd/user/pulseaudio.socket.d/30_qubes.conf
+/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
 
 %post systemd
 
diff --git a/vm-init.d/qubes-updates-proxy b/vm-init.d/qubes-updates-proxy
index ae71762..7bbc52e 100755
--- a/vm-init.d/qubes-updates-proxy
+++ b/vm-init.d/qubes-updates-proxy
@@ -25,7 +25,7 @@
 exec="/usr/sbin/tinyproxy"
 prog=$(basename $exec)
 config="/etc/tinyproxy/tinyproxy-updates.conf"
-pidfile="/var/run/tinyproxy/tinyproxy-updates.pid"
+pidfile="/var/run/tinyproxy-updates/tinyproxy.pid"
 
 [ -e /etc/sysconfig/tinyproxy-updates ] && . /etc/sysconfig/tinyproxy-updates
 
diff --git a/vm-systemd/qubes-core-agent-linux.tmpfiles b/vm-systemd/qubes-core-agent-linux.tmpfiles
new file mode 100644
index 0000000..31b4ae9
--- /dev/null
+++ b/vm-systemd/qubes-core-agent-linux.tmpfiles
@@ -0,0 +1 @@
+d /var/run/tinyproxy-updates 0755 tinyproxy tinyproxy
diff --git a/vm-systemd/qubes-updates-proxy.service b/vm-systemd/qubes-updates-proxy.service
index c89a785..5f811a5 100644
--- a/vm-systemd/qubes-updates-proxy.service
+++ b/vm-systemd/qubes-updates-proxy.service
@@ -5,7 +5,6 @@ ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy
 After=qubes-iptables.service
 
 [Service]
-ExecStartPre=/usr/bin/install -d --owner tinyproxy --group tinyproxy /var/run/tinyproxy
 ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start
 ExecStart=/usr/sbin/tinyproxy -d -c /etc/tinyproxy/tinyproxy-updates.conf
 ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop