diff --git a/.cvsignore b/.cvsignore
index d715cb9..f3f9692 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslog-ng-1.6.10.tar.gz
+syslog-ng-1.6.11.tar.gz
diff --git a/sources b/sources
index 27c7252..376128f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b723dc5e8454bc274fdab415ac7ea5ea  syslog-ng-1.6.10.tar.gz
+8f9ca6140f428dc9adec9fa1c270a2dd  syslog-ng-1.6.11.tar.gz
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 3262d95..29b8752 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,22 +1,36 @@
+#
+# Rebuild option:
+#
+#   --with spoofing           enables the syslog-ng feature spoof-source
+#                             (see README.spoof for more information)
+#
 
 %define sbindir   /sbin
+%define libolver  0.3.18
+%define spoofing  0
+
+%{?_with_spoofing:%define spoofing 1}
 
 Name:             syslog-ng
-Version:          1.6.10
+Version:          1.6.11
 Release:          1%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
 License:          GPL
-Url:              http://www.balabit.com/products/syslog_ng/
+URL:              http://www.balabit.com/products/syslog_ng/
 Source0:          http://www.balabit.com/downloads/syslog-ng/1.6/src/syslog-ng-%{version}.tar.gz
 Source1:          syslog.log
 Patch0:           syslog-ng-1.6.7-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildConflicts:   libol-devel < 0.3.17
-BuildRequires:    flex, tcp_wrappers, which
+BuildConflicts:   libol-devel < %{libolver}
+BuildRequires:    flex, which
+BuildRequires:    tcp_wrappers
+%if %{spoofing}
+BuildRequires:    libnet-devel >= 1.1
+%endif
 Requires:         logrotate
 Requires(post):   chkconfig, initscripts
 Requires(preun):  chkconfig, initscripts
@@ -47,11 +61,14 @@ ideal for firewalled environments.
 %patch1 -p1
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
 chmod a-x contrib/syslog2ng
-mv libol-0.3.18/ChangeLog ChangeLog.libol
+mv libol-%{libolver}/{ChangeLog,ChangeLog.libol}
 
 %build
 %configure \
     --sbindir=%{sbindir} \
+%if %{spoofing}
+    --enable-spoof-source \
+%endif
     --enable-tcp-wrapper
 make %{?_smp_mflags}
 
@@ -81,15 +98,15 @@ rm -rf $RPM_BUILD_ROOT
 %post
 # only rpm -i (not rpm {-U|-F})
 if [ $1 = 1 ]; then
-	/sbin/chkconfig --add syslog-ng
-#	/sbin/service syslog-ng start
+    /sbin/chkconfig --add syslog-ng
+#   /sbin/service syslog-ng start
 fi
 
 %preun
 # only rpm -e (not rpm {-U|-F})
 if [ $1 = 0 ]; then
-	/sbin/service syslog-ng stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del syslog-ng
+    /sbin/service syslog-ng stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del syslog-ng
 fi
 
 %postun
@@ -102,11 +119,10 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS
-%doc doc/sgml/syslog-ng.txt
-%doc doc/*.demo doc/*.sample
+%doc doc/sgml/syslog-ng.txt doc/*.{demo,sample}
 %doc contrib/syslog-ng.conf.doc
 %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl
-%doc ChangeLog.libol
+%doc libol-%{libolver}/ChangeLog.libol
 %{sbindir}/syslog-ng
 %{_initrddir}/syslog-ng
 %dir %{_sysconfdir}/%{name}
@@ -118,8 +134,16 @@ fi
 
 
 %changelog
+* Fri May  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.11-1
+- Update to 1.6.11.
+
+* Sun Apr  2 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.10-2
+- Build option to support the syslog-ng spoof-source feature
+  (the feature spoof-source is disabled by default).
+
 * Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.10-1
 - Update to 1.6.10.
+- The postscript documentation has been dropped (upstream).
 
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.6.9-1
 - Build conflict statement