diff --git a/.cvsignore b/.cvsignore
index cb1353f..a031469 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslog-ng-2.0.5.tar.gz
+syslog-ng-2.0.7.tar.gz
diff --git a/sources b/sources
index 4e6d907..2be3f7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c161eefc450fabc246c1a10997c6c6a5  syslog-ng-2.0.5.tar.gz
+dc3726fbedb738901c5588fa36e00bbf  syslog-ng-2.0.7.tar.gz
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 83949c5..358ea4b 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,17 +1,15 @@
-
 # Rebuild option:
 #
 #   --with spoofsource              enables the syslog-ng spoof-source feature
 #
 
 %define spoofsource  0
-
 %{?_with_spoofsource:%define spoofsource 1}
 
 %define sbindir   /sbin
 
 Name:             syslog-ng
-Version:          2.0.5
+Version:          2.0.7
 Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
@@ -26,6 +24,7 @@ Patch2:           syslog-ng-2.0.5-conf.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    flex
+BuildRequires:    byacc
 BuildRequires:    pkgconfig >= 0.20
 BuildRequires:    glib2-devel >= 2.2
 BuildRequires:    eventlog-devel >= 0.2.5
@@ -42,6 +41,7 @@ Requires(postun): initscripts
 # Keep initscripts and vixie-cron happy
 #
 Provides:         syslog
+Conflicts:        rsyslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new
@@ -61,6 +61,9 @@ ideal for firewalled environments.
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 chmod -c a-x contrib/syslog2ng
 
+# force regeneration to avoid broken paths from upstream (#265221)
+touch src/cfg-grammar.y
+
 
 %build
 %configure \
@@ -159,11 +162,12 @@ fi
 %doc doc/security/*.txt
 %doc doc/examples/syslog-ng.conf.sample
 %doc contrib/{relogger.pl,syslog2ng,syslog-ng.conf.doc}
-%{sbindir}/syslog-ng
-%{_initrddir}/syslog-ng
+%{_bindir}/loggen
+%{sbindir}/%{name}
+%{_initrddir}/%{name}
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/syslog-ng.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/syslog-ng
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
 %{_datadir}/%{name}/
 %{_mandir}/man5/*.5*
@@ -172,6 +176,21 @@ fi
 
 
 %changelog
+* Tue Jan 08 2008 Douglas E. Warner <silfreed@silfreed.net> 2.0.7-1
+- updated to 2.0.7
+- force regeneration to avoid broken paths from upstream (#265221)
+- adding loggen binary
+
+* Mon Dec 17 2007 Douglas E. Warner <silfreed@silfreed.net> 2.0.6-1
+- updated to 2.0.6
+- fixes DoS in ZSA-2007-029
+
+* Thu Nov 29 2007 Peter Vrabec <pvrabec@redhat.com> 2.0.5-3
+- add conflicts (#400661)
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.5-2
+- Rebuild for selinux ppc32 issue.
+
 * Thu Jul 26 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.5-1
 - Update to 2.0.5