diff --git a/.cvsignore b/.cvsignore
index fad05dc..51c95d9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-syslog-ng-2.0.2.tar.gz
+syslog-ng-2.0.2+20070309.tar.gz
diff --git a/sources b/sources
index 30132f3..bb3ee19 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ef12e1e43a99c5b6b8d1984dde72151  syslog-ng-2.0.2.tar.gz
+7335f03e2cdc4f602b3bc6c7b634f24a  syslog-ng-2.0.2+20070309.tar.gz
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 83c8fa5..69a1e62 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -1,14 +1,27 @@
+
+# Rebuild option:
+#
+#   --with spoofsource              enables the syslog-ng spoof-source feature
+#
+
+%define spoofsource  0
+
+%{?_with_spoofsource:%define spoofsource 1}
+
 %define sbindir   /sbin
 
+%define snapdate  20070309
+%define snapshot  2.0.2+%{snapdate}
+
 Name:             syslog-ng
-Version:          2.0.2
-Release:          2%{?dist}
+Version:          2.0.3
+Release:          0.%{snapdate}%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
 License:          GPL
 URL:              http://www.balabit.com/products/syslog_ng/
-Source0:          http://www.balabit.com/downloads/syslog-ng/2.0/src/syslog-ng-%{version}.tar.gz
+Source0:          http://www.balabit.com/downloads/syslog-ng/2.0/src-snapshot/syslog-ng-%{snapshot}.tar.gz
 Source1:          syslog.log
 Patch0:           syslog-ng-2.0.0-init.patch
 Patch1:           syslog-ng-1.6.7-logrotate.patch
@@ -18,6 +31,10 @@ BuildRequires:    flex
 BuildRequires:    pkgconfig >= 0.20
 BuildRequires:    glib2-devel >= 2.2
 BuildRequires:    eventlog-devel >= 0.2.5
+BuildRequires:    tcp_wrappers-devel
+%if %{spoofsource}
+BuildRequires:    libnet-devel >= 1.1
+%endif
 
 Requires:         logrotate
 Requires(post):   chkconfig, initscripts
@@ -39,7 +56,7 @@ ideal for firewalled environments.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{snapshot}
 %patch0 -p1
 %patch1 -p1
 %{__sed} -i  's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -51,6 +68,12 @@ chmod -c a-x contrib/syslog2ng
     --sbindir=%{sbindir} \
     --sysconfdir=%{_sysconfdir}/syslog-ng \
     --enable-ipv6 \
+    --enable-tcp-wrapper \
+%if ! %{spoofsource}
+    --disable-spoof-source \
+%else
+    --enable-spoof-source \
+%endif
     --enable-dynamic-linking
 make %{?_smp_mflags}
 
@@ -78,8 +101,9 @@ install -p -m 644 %{SOURCE1} \
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 install -p -m 644 contrib/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/%{name}/
 for vimver in 63 64 70 ; do
-    install -dm 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
-    ln -s %{_datadir}/%{name}/syslog-ng.vim $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+    install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+    cd $RPM_BUILD_ROOT%{_datadir}/vim/vim$vimver/syntax
+    ln -s ../../../%{name}/syslog-ng.vim .
 done
 
 
@@ -147,6 +171,11 @@ fi
 
 
 %changelog
+* Fri Mar  9 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.3-0.20070309
+- Enable support for TCP wrappers (--enable-tcp-wrapper).
+- Optional support for spoofed source addresses (--enable-spoof-source)
+  (disabled by default; build requires libnet).
+
 * Sun Feb 25 2007 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.0.2-2
 - Dynamic link glib2 and eventlog (--enable-dynamic-linking).
   For Fedora Core 6 (and above) both packages install their dynamic