diff --git a/.cvsignore b/.cvsignore
index 820800a..74c50f9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-dhcp-4.1.1.tar.gz
 ldap-for-dhcp-4.1.1-2.tar.gz
+dhcp-4.1.1-P1.tar.gz
diff --git a/dhcp.spec b/dhcp.spec
index a3bba85..fee7530 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -12,8 +12,8 @@
 
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
-Version:  %{basever}
-Release:  16%{?dist}
+Version:  %{basever}_P1
+Release:  1%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -22,7 +22,7 @@ Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
 URL:      http://isc.org/products/DHCP/
-Source0:  ftp://ftp.isc.org/isc/%{name}/%{name}-%{version}.tar.gz
+Source0:  ftp://ftp.isc.org/isc/dhcp/dhcp-%{basever}-P1.tar.gz
 Source1:  http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/ldap-for-dhcp-%{ldappatchver}.tar.gz
 Source2:  dhcpd.init
 Source3:  dhcrelay.init
@@ -121,8 +121,8 @@ Header files and API documentation for using the ISC DHCP libraries.  The
 libdhcpctl and libomapi static libraries are also included in this package.
 
 %prep
-%setup -q
-%setup -T -D -a 1
+%setup -q -n dhcp-%{basever}-P1
+%setup -T -D -a 1 -n dhcp-%{basever}-P1
 
 # Add in LDAP support
 %{__patch} -p1 < ldap-for-dhcp-%{ldappatchver}/%{name}-%{basever}-ldap.patch
@@ -258,7 +258,7 @@ popd
 %{__perl_requires} \
 | %{__grep} -v 'perl('
 EOF
-%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{basever}-P1/%{name}-req
 %{__chmod} +x %{__perl_requires}
 
 # Replace @PRODUCTNAME@
@@ -288,7 +288,7 @@ autoheader
 automake --foreign --add-missing --copy
 
 %build
-CFLAGS="%{optflags} -fPIC -D_GNU_SOURCE" \
+CFLAGS="%{optflags} -fno-strict-aliasing -fPIC -D_GNU_SOURCE" \
 %configure \
     --enable-dhcpv6 \
     --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \
@@ -511,6 +511,10 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Jun 02 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1_P1-1
+- 4.1.1-P1 (pair of bug fixes including one for a security related bug).
+- Compile with -fno-strict-aliasing
+
 * Wed Apr 28 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.1.1-16
 - Move /etc/NetworkManager/dispatcher.d/10-dhclient script
   from dhcp to dhclient subpackage (#586999).
diff --git a/sources b/sources
index 9fd909c..bf23639 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-38a74c89d8913b9b5f33737047623c18  dhcp-4.1.1.tar.gz
 9fa2f64826c969a55fd28263e4b6cad6  ldap-for-dhcp-4.1.1-2.tar.gz
+ee390a35687dd75dbfc32c856c0938d1  dhcp-4.1.1-P1.tar.gz