diff --git a/xl2tpd.spec b/xl2tpd.spec
index 4befc8f..5061c90 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -9,7 +9,11 @@ Group: System Environment/Daemons
 Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp 
-#BuildRequires:
+%if 0%{?el3}%{?el4}
+BuildRequires: libpcap
+%else
+BuildRequires: libpcap-devel
+%endif
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -28,6 +32,16 @@ Example configuration files for such a setup are included in this RPM.
 xl2tpd works by opening a pseudo-tty for communicating with pppd.
 It runs completely in userspace.
 
+xl2tpd supports IPsec SA Reference tracking to enable overlapping internak
+NAT'ed IP's by different clients (eg all clients connecting from their
+linksys internal IP 192.168.1.101) as well as multiple clients behind
+the same NAT router.
+
+xl2tpd supports the pppol2tp kernel mode operations on 2.6.23 or higher,
+or via a patch in contrib for 2.4.x kernels.
+
+Xl2tpd is based on the 0.69 L2TP by Jeff McAdams <jeffm@iglou.com>
+It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> in 2002 and 2003.
 
 %prep
 %setup -q
@@ -38,7 +52,7 @@ sed -i -e 's|chkconfig:[ \t][ \t]*|chkconfig: |' packaging/fedora/xl2tpd.init
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 install -p -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf
 install -p -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd
 install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets
@@ -69,6 +83,7 @@ fi
 %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt 
 %doc doc/README.patents examples/chapsecrets.sample
 %{_sbindir}/xl2tpd
+%{_bindir}/pfc
 %{_mandir}/*/*
 %dir %{_sysconfdir}/xl2tpd
 %config(noreplace) %{_sysconfdir}/xl2tpd/*
@@ -79,6 +94,7 @@ fi
 %changelog
 * Sun Mar 08 2009 Paul Wouters <paul@xelerance.com> - 1.2.4-1
 - Upgraded to 1.2.4
+- Merged spec file with upstream
 
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild