diff --git a/bind-9.6.1P1.tar.gz b/bind-9.6.1P1.tar.gz
deleted file mode 100644
index bbd2c8a..0000000
--- a/bind-9.6.1P1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7150cd712efbc40611d88ea1ba72a85bd7ceb4aa86edfdd98d9ad8a0dd30515
-size 6609714
diff --git a/bind-9.6.1P2.tar.gz b/bind-9.6.1P2.tar.gz
new file mode 100644
index 0000000..105e36a
--- /dev/null
+++ b/bind-9.6.1P2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:094ff51bd0f4eec62a3410b82ffe31c273590bac042a3bd817a67f5b88bbfc24
+size 6699115
diff --git a/bind.changes b/bind.changes
index 69e168a..0814533 100644
--- a/bind.changes
+++ b/bind.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Nov 25 09:44:13 CET 2009 - ug@suse.de
+
+- Security fix
+  When validating, track whether pending data was from
+  the additional section or not and only return it if
+  validates as secure. [RT #20438]
+  CVE-2009-4022
+  bnc#558260
+- update from P1 to P2
+
 -------------------------------------------------------------------
 Fri Nov 20 10:08:50 CET 2009 - ug@suse.de
 
diff --git a/bind.spec b/bind.spec
index dfdb604..ccbb72b 100644
--- a/bind.spec
+++ b/bind.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bind (Version 9.6.1P1)
+# spec file for package bind (Version 9.6.1P2)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,14 +20,14 @@
 
 Name:           bind
 %define pkg_name bind
-%define pkg_vers 9.6.1P1
+%define pkg_vers 9.6.1P2
 #BuildRequires:  openldap2 openldap2-devel
 BuildRequires:  libcap libcap-devel libmysqlclient-devel libxml2-devel openssl openssl-devel
 Summary:        Domain Name System (DNS) Server (named)
-Version:        9.6.1P1
-Release:        5
+Version:        9.6.1P2
+Release:        1
 %define       SDB_LDAP_VERSION      1.0-beta
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/DNS/Servers
 Provides:       dns_daemon bind8 bind9
 Obsoletes:      bind8 bind9
@@ -82,7 +82,7 @@ Authors:
     ISC Software <bind@isc.org>
 
 %package chrootenv
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        Chroot environment for BIND named and lwresd
 Group:          Productivity/Networking/DNS/Servers
 PreReq:         /usr/sbin/groupadd /usr/sbin/useradd
@@ -99,7 +99,7 @@ Authors:
     ISC Software <bind@isc.org>
 
 %package devel
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        Development Libraries and Header Files of BIND
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-libs = %{version}
@@ -124,7 +124,7 @@ Authors:
     ISC Software <bind@isc.org>
 
 %package doc
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        BIND documentation
 Group:          Documentation/Other
 
@@ -140,7 +140,7 @@ Authors:
     ISC Software <bind@isc.org>
 
 %package libs
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        Shared libraries of BIND
 Group:          Development/Libraries/C and C++
 # bug437293
@@ -161,7 +161,7 @@ Authors:
     ISC Software <bind@isc.org>
 
 %package lwresd
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        Lightweight Resolver Daemon
 Group:          Productivity/Networking/DNS/Utilities
 Requires:       %{name}-chrootenv
@@ -183,7 +183,7 @@ Authors:
     ISC Software <bind@isc.org>
 
 %package utils
-License:        BSD 3-clause (or similar) ; MIT License (or similar)
+License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        Utilities to query and test DNS
 Group:          Productivity/Networking/DNS/Utilities
 Provides:       dns_utils bindutil bind9-utils