diff --git a/rsyslog.changes b/rsyslog.changes
index 6eb61f4..597d35f 100644
--- a/rsyslog.changes
+++ b/rsyslog.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 22 14:37:57 UTC 2014 - mt@suse.de
+
+- Stop syslog.socket in %preun to avoid the daemon we uninstall
+  gets started by a log message due to dependencies (bnc#840815).
+
 -------------------------------------------------------------------
 Thu Aug 21 15:20:20 UTC 2014 - mrueckert@suse.de
 
diff --git a/rsyslog.spec b/rsyslog.spec
index 66fcece..38bb3e1 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -829,6 +829,7 @@ chmod 640 ".%{rsyslog_sockets_cfg}"
 # stop the rsyslogd daemon when it is running
 #
 %if %{with systemd} && ! %{with systemv}
+%{service_del_preun syslog.socket}
 %{service_del_preun rsyslog.service}
 %else
 if test -x /etc/init.d/syslog ; then