diff --git a/syslog-service-generator b/syslog-service-generator
index bf2bab9..0835d8f 100644
--- a/syslog-service-generator
+++ b/syslog-service-generator
@@ -18,6 +18,9 @@
 #
 
 umask 0022
+TMPDIR=/run
+
+export TMPDIR
 
 : ${SBINDIR:=/sbin}
 : ${RUN_PATH:=/run/systemd}
diff --git a/syslogd.changes b/syslogd.changes
index 85a1c84..67e695f 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 21 09:15:14 UTC 2011 - werner@suse.de
+
+- Help the bash by using TMPDIR=/run to avoid trouble with the
+  temporary files used for here-documents (bnc#724610) 
+
 -------------------------------------------------------------------
 Tue Sep 20 08:38:55 UTC 2011 - werner@suse.de