diff --git a/screen.changes b/screen.changes
index d210ad6..8d49057 100644
--- a/screen.changes
+++ b/screen.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 18 13:09:57 UTC 2011 - jw@suse.com
+
+- mkdir /var/run/*screen both immediatly and via systemd.
+
 -------------------------------------------------------------------
 Mon Sep 19 14:00:10 UTC 2011 - trenn@suse.de
 
diff --git a/screen.spec b/screen.spec
index 37176a1..f206e63 100644
--- a/screen.spec
+++ b/screen.spec
@@ -31,7 +31,7 @@ Group:          System/Console
 PreReq:         %install_info_prereq
 AutoReqProv:    on
 Version:        4.0.3
-Release:        17
+Release:        19
 Summary:        A program to allow multiple screens on a VT100/ANSI Terminal
 Source:         %{name}-%{version}.tar.bz2
 Source1:        screen.conf
@@ -99,7 +99,7 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 %dir /usr/lib/tmpfiles.d
 /usr/lib/tmpfiles.d/screen.conf
 /usr/share/screen/utf8encodings
-# Created via aaa_base on system boot
+# Created via aaa_base or systemd on system boot
 %ghost %dir /var/run/screens
 %ghost %dir /var/run/uscreens
 %doc %{_infodir}/screen.info*.gz
@@ -108,6 +108,11 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
+# Create our dirs immediatly, after a manual package install.
+# After a reboot systemd/aaa_base will take care.
+test -d /var/run/screens || mkdir -m 755 /var/run/screens
+test -d /var/run/uscreens || mkdir -m 1777 /var/run/uscreens
+
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz