diff --git a/dhcp-4.2.2-ldap-patch-mt01.diff.bz2 b/dhcp-4.2.2-ldap-patch-mt01.diff.bz2
deleted file mode 100644
index 5e94734..0000000
--- a/dhcp-4.2.2-ldap-patch-mt01.diff.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b113289cbcaf5d9f76892b48a6c8a452f7f2180aab1a06a8acacc49d0fa137a9
-size 11732
diff --git a/dhcp-4.2.2.tar.bz2 b/dhcp-4.2.2.tar.bz2
deleted file mode 100644
index 2f62ca7..0000000
--- a/dhcp-4.2.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfafcabbd4b2f099fd7ae1f9a9f6f2dc472b134ed5b6a391c2f7082dfdc2d8b6
-size 8613758
diff --git a/dhcp-4.2.3-P1-ldap-patch-mt01.diff.bz2 b/dhcp-4.2.3-P1-ldap-patch-mt01.diff.bz2
new file mode 100644
index 0000000..ff5d76d
--- /dev/null
+++ b/dhcp-4.2.3-P1-ldap-patch-mt01.diff.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f791f5490fe238a97f1d6875e8e7ba1423cb71dbb7203c0887e2522c0d9e83a6
+size 11872
diff --git a/dhcp-4.2.3-P1.tar.bz2 b/dhcp-4.2.3-P1.tar.bz2
new file mode 100644
index 0000000..5f98d05
--- /dev/null
+++ b/dhcp-4.2.3-P1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3b924fef93e7cdb72e84dce81f0121a43964e43995f40e12c17b933c38148bf
+size 9367106
diff --git a/dhcp.changes b/dhcp.changes
index 2b42923..5a618be 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Dec  9 13:40:53 UTC 2011 - mt@suse.com
+
+- Updated to ISC dhcp-4.2.3-P1 release, providing security fix for
+  a DoS due to processing certain regular expressions (bnc#735610)
+  and several important DDNS related fixes:
+  * Add a check for a null pointer before calling the regexec function.
+    Without out this check we could, under some circumstances, pass
+    a null pointer to the regexec function causing it to segfault.
+    Thanks to a report from BlueCat Networks. [ISC-Bugs #26704]
+    CVE-2011-4539.
+  * Fix the code that checks for an existing DDNS transaction to
+    cancel when removing DDNS information, so that we will continue
+    with the processing if we have a lease even if it doesn't have an
+    outstanding transaction.  [ISC-Bugs #24682]
+  * Add AM_MAINTAINER_MODE to configure.ac to avoid rebuilding
+    configuration files.  [ISC-Bugs #24107]
+  * Add support for passing DDNS information to a DNS server over
+    an IPv6 address.  [ISC-Bugs #22647]
+  * Enhanced patch for 23595 to handle IPv4 fixed addresses more
+    cleanly.  [ISC-Bugs #23595]
+- Refreshed ldap patch
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:54 UTC 2011 - coolo@suse.com
 
diff --git a/dhcp.spec b/dhcp.spec
index 14de11e..6d8d1ac 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -17,7 +17,7 @@
 
 # norootforbuild
 
-%define isc_version   4.2.2
+%define isc_version   4.2.3-P1
 %define susefw2dir    %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %define omc_prefix    /usr/share/omc
 %define omc_svcdir    %{omc_prefix}/svcinfo.d
@@ -37,11 +37,11 @@ BuildRequires:  openldap2-devel
 %endif
 BuildRequires:  dos2unix
 BuildRequires:  libtool
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
 Group:          Productivity/Networking/Boot/Servers
 AutoReqProv:    on
-Version:        4.2.2
-Release:        3
+Version:        4.2.3
+Release:        P1.0.<RELEASE0>
 Summary:        Common Files Used by ISC DHCP Software
 Url:            http://www.isc.org/software/dhcp
 Source0:        dhcp-%{isc_version}.tar.bz2
@@ -82,7 +82,7 @@ Patch15:        contrib-lease-path.diff
 Patch20:        dhcp-4.1.1-dhclient-exec-filedes.diff
 Patch21:        dhcp-4.2.2-dhclient-send-hostname-rml.diff
 ## patch repo lives here: http://www.suse.de/~mt/git/dhcp-ldap.git/
-Patch30:        dhcp-4.2.2-ldap-patch-mt01.diff.bz2
+Patch30:        dhcp-4.2.3-P1-ldap-patch-mt01.diff.bz2
 Patch40:        dhcp-4.1.1-P1-lpf-bind-msg-fix.diff
 Patch44:        dhcp-4.2.2-xen-checksum.diff
 Patch45:        dhcp-4.2.2-dhclient-option-checks.bnc675052.diff
@@ -93,7 +93,7 @@ PreReq:         /bin/touch /sbin/chkconfig sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package server
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
 Summary:        ISC DHCP Server
 Group:          Productivity/Networking/Boot/Servers
 Requires:       net-tools dhcp = %{version}
@@ -101,7 +101,7 @@ PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/
 AutoReqProv:    on
 
 %package client
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
 Summary:        ISC DHCP Client
 Group:          Productivity/Networking/Boot/Clients
 Requires:       net-tools dhcp = %{version} /sbin/arping /usr/bin/host
@@ -109,7 +109,7 @@ PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /bin/
 AutoReqProv:    on
 
 %package relay
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
 Summary:        ISC DHCP Relay Agent
 Group:          Productivity/Networking/Boot/Servers
 Requires:       net-tools dhcp = %{version}
@@ -117,7 +117,7 @@ PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp
 AutoReqProv:    on
 
 %package devel
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
 Summary:        Header Files and Libraries for dhcpctl API
 Group:          Development/Libraries/C and C++
 Requires:       dhcp = %{version}
@@ -125,7 +125,7 @@ Requires:       dhcp = %{version}
 %if %{with_doc_package}
 
 %package doc
-License:        BSD3c(or similar)
+License:        BSD-3-Clause
 Summary:        Documentation
 Group:          Productivity/Networking/Boot/Servers
 %endif