diff --git a/systemd-tmp-safe-defaults.patch b/systemd-tmp-safe-defaults.patch
new file mode 100644
index 0000000..7fca32c
--- /dev/null
+++ b/systemd-tmp-safe-defaults.patch
@@ -0,0 +1,17 @@
+max@suse.de FATE#314974
+
+Index: systemd-200/tmpfiles.d/tmp.conf
+===================================================================
+--- systemd-200.orig/tmpfiles.d/tmp.conf	2013-03-20 22:58:40.159281473 +0100
++++ systemd-200/tmpfiles.d/tmp.conf	2013-04-19 14:37:47.500403658 +0200
+@@ -8,8 +8,8 @@
+ # See tmpfiles.d(5) for details
+ 
+ # Clear tmp directories separately, to make them easier to override
+-d /tmp 1777 root root 10d
+-d /var/tmp 1777 root root 30d
++d /tmp 1777 root root
++d /var/tmp 1777 root root
+ 
+ # Exclude namespace mountpoints created with PrivateTmp=yes
+ x /tmp/systemd-private-*
diff --git a/systemd.changes b/systemd.changes
index 0c46ae3..6ba66c8 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 19 12:47:13 UTC 2013 - max@suse.com
+
+- Fix regression in the default for tmp auto-deletion
+  (systemd-tmp-safe-defaults.patch, FATE#314974).
+
 -------------------------------------------------------------------
 Fri Apr 12 16:58:31 UTC 2013 - fcrozat@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 4963f5f..76b5c95 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -146,6 +146,8 @@ Patch26:        ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch
 Patch27:        apply-ACL-for-nvidia-device-nodes.patch
 # PATCH-FIX-OPENSUSE Revert-service-drop-support-for-SysV-scripts-for-the-early.patch fcrozat@suse.com -- handle boot.* initscripts
 Patch37:        Revert-service-drop-support-for-SysV-scripts-for-the-early.patch
+# PATCH-FIX-OPENSUSE systemd-tmp-safe-defaults.patch -- FATE#314974 max@suse.de -- Return to SUSE's "safe defaults" policy on deleting files from tmp direcorie.
+Patch39:        systemd-tmp-safe-defaults.patch
 
 # Upstream First - Policy:
 # Never add any patches to this package without the upstream commit id
@@ -394,6 +396,7 @@ cp %{SOURCE7} m4/
 %patch27 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 
 %build
 autoreconf -fiv