diff --git a/.cvsignore b/.cvsignore
index 47a5296..75c466b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
 rsyslog.init
 rsyslog.sysconfig
-rsyslog-1.19.10.tar.gz
+rsyslog-1.19.11.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index d0b30d6..82de3b4 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -2,7 +2,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
-Version: 1.19.10
+Version: 1.19.11
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
@@ -22,6 +22,7 @@ Requires(postun): /sbin/service
 Provides: syslog
 Provides: sysklogd = 1.4.3-1
 Obsoletes: sysklogd < 1.4.3-1
+Conflicts: syslog-ng
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %package mysql
@@ -117,6 +118,10 @@ fi
 %{_libdir}/rsyslog/ommysql.so
 
 %changelog
+* Thu Nov 29 2007 Peter Vrabec <pvrabec@redhat.com> 1.19.11-1
+- new upstream release
+- add conflicts (#400671)
+
 * Mon Nov 19 2007 Peter Vrabec <pvrabec@redhat.com> 1.19.10-1
 - new upstream release
 
diff --git a/sources b/sources
index 0f91f44..af69cdc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 fe8fcd90c672701fa198dd1206df64ae  rsyslog.init
 e10d2dc3238c2cf2a54933f10b19b9bf  rsyslog.sysconfig
-9aea93c0ad90db8ff5553d18b0ff75e7  rsyslog-1.19.10.tar.gz
+ebcbd1c82885c11b4711441eb34c8393  rsyslog-1.19.11.tar.gz