diff --git a/znc.spec b/znc.spec
index db71acd..5482783 100644
--- a/znc.spec
+++ b/znc.spec
@@ -2,21 +2,19 @@ Summary:        An advanced IRC bouncer
 Name:           znc
 Version:        0.090
 #Release:        0.1.rc1%{?dist}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2 with exceptions
 Group:          System Environment/Daemons
 URL:            http://znc.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         znc-trafficstats.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  perl gcc-c++
 BuildRequires:  openssl-devel >= 0.9.8
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  c-ares-devel
-
-# The following line is necessary because this module
-# is needed for Fedora, but not for EPEL.
-%{?fedora:BuildRequires: perl-ExtUtils-Embed}
+BuildRequires:  perl(ExtUtils::Embed)
 
 %description
 ZNC is an IRC bouncer with many advanced features like detaching,
@@ -43,6 +41,7 @@ Extra modules for ZNC
 
 %prep
 %setup -q
+%patch0 -p1
 %__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp
 chmod -x modules/q.cpp
 
@@ -131,6 +130,10 @@ chmod -x modules/q.cpp
 %{_libdir}/znc/shell.so
 
 %changelog
+* Wed Jun 16 2010 Nick Bebout <nb@fedoraproject.org> - 0.090-2
+- Backport r2026 of ZNC subversion repo to fix bug 603915
+- NULL pointer dereference flaw leads to segfault under certain conditions
+
 * Sun Jun 06 2010 Nick Bebout <nb@fedoraproject.org> - 0.090-1
 - Update to znc 0.090