diff --git a/.cvsignore b/.cvsignore
index ea97c50..cb1353f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslog-ng-2.0.4.tar.gz
+syslog-ng-2.0.5.tar.gz
diff --git a/sources b/sources
index 7664dec..4e6d907 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51e72f9687e5a3a3c01e51ed9de96378  syslog-ng-2.0.4.tar.gz
+c161eefc450fabc246c1a10997c6c6a5  syslog-ng-2.0.5.tar.gz
diff --git a/syslog-ng-2.0.4-conf.patch b/syslog-ng-2.0.5-conf.patch
similarity index 73%
rename from syslog-ng-2.0.4-conf.patch
rename to syslog-ng-2.0.5-conf.patch
index 0b3be1a..1bab4d4 100644
--- a/syslog-ng-2.0.4-conf.patch
+++ b/syslog-ng-2.0.5-conf.patch
@@ -1,6 +1,6 @@
-diff -ruN syslog-ng-2.0.4-orig/contrib/fedora-packaging/syslog-ng.conf syslog-ng-2.0.4/contrib/fedora-packaging/syslog-ng.conf
---- syslog-ng-2.0.4-orig/contrib/fedora-packaging/syslog-ng.conf	2007-04-19 20:37:16.000000000 +0100
-+++ syslog-ng-2.0.4/contrib/fedora-packaging/syslog-ng.conf	2007-05-31 21:57:32.000000000 +0100
+diff -ruN syslog-ng-2.0.5-orig/contrib/fedora-packaging/syslog-ng.conf syslog-ng-2.0.5/contrib/fedora-packaging/syslog-ng.conf
+--- syslog-ng-2.0.5-orig/contrib/fedora-packaging/syslog-ng.conf	2007-04-19 20:37:16.000000000 +0100
++++ syslog-ng-2.0.5/contrib/fedora-packaging/syslog-ng.conf	2007-07-26 16:02:11.000000000 +0100
 @@ -8,15 +8,15 @@
  # 20000925 gb@sysfive.com
  #
@@ -22,29 +22,29 @@ diff -ruN syslog-ng-2.0.4-orig/contrib/fedora-packaging/syslog-ng.conf syslog-ng
  #     these filters were only allowing messages of one specific
  #     priority level; they should be allowing messages from that
  #     priority and upper levels.
-@@ -28,6 +28,9 @@
+@@ -28,6 +28,13 @@
  #   - /proc/kmsg is a file not a pipe.
  #     (https://lists.balabit.hu/pipermail/syslog-ng/2005-February/006963.html)
  #
 +# Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 31 May 2007
 +#   - increase the number of unix-stream max-connections (syslog-ng 2.0.4)
++#
++# Updated by Jose Pedro Oliveira (<jpo at di.uminho.pt>) - 26 July 2007
++#   - revert previous unix-stream max-connections change
++#     (the new unix-stream max-connections default in syslog-ng 2.0.5 is 256)
 +#
  
  options {
      sync (0);
-@@ -42,9 +45,10 @@
- 
- source s_sys {
-     file ("/proc/kmsg" log_prefix("kernel: "));
--    unix-stream ("/dev/log");
-+    unix-stream ("/dev/log" max-connections(32));
+@@ -45,6 +52,7 @@
+     unix-stream ("/dev/log");
      internal();
      # udp(ip(0.0.0.0) port(514));
 +    # tcp(ip(0.0.0.0) port(514));
  };
  
  destination d_cons { file("/dev/console"); };
-@@ -75,3 +79,5 @@
+@@ -75,3 +83,5 @@
  log { source(s_sys); filter(f_filter6); destination(d_spol); };
  log { source(s_sys); filter(f_filter7); destination(d_boot); };
  log { source(s_sys); filter(f_filter8); destination(d_cron); };
diff --git a/syslog-ng.spec b/syslog-ng.spec
index c0a978d..83949c5 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -11,8 +11,8 @@
 %define sbindir   /sbin
 
 Name:             syslog-ng
-Version:          2.0.4
-Release:          4%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
@@ -22,7 +22,7 @@ Source0:          http://www.balabit.com/downloads/files/syslog-ng/sources/2.0/s
 Source1:          syslog.log
 Patch0:           syslog-ng-2.0.0-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
-Patch2:           syslog-ng-2.0.4-conf.patch
+Patch2:           syslog-ng-2.0.5-conf.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    flex
@@ -172,6 +172,9 @@ fi
 
 
 %changelog
+* Thu Jul 26 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.5-1
+- Update to 2.0.5
+
 * Thu Jun  7 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.4-4
 - Add support for vim 7.1.