diff --git a/CHANGES b/CHANGES
index 200036dfb9b89f9ac7f5eca0244ec8fcc0f82c9b..9021ebb32baea76aa8fd1db7852a83427ccd011b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2909.	[bug]		named-checkzone -p could die if "update-policy local;"
+			was specified in named.conf. [RT #21416]
+
 2908.	[bug]		It was possible for re-signing to stop after removing
 			a DNSKEY. [RT #21384]
 
diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf
index c810b47d2c3d699f2d1e00b77da775e584e87ed0..3b3ef0b531bba75198f35735da9e8f07840b531b 100644
--- a/bin/tests/system/checkconf/good.conf
+++ b/bin/tests/system/checkconf/good.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: good.conf,v 1.4 2007/06/19 23:47:01 tbox Exp $ */
+/* $Id: good.conf,v 1.5 2010/06/02 01:07:47 marka Exp $ */
 
 /*
  * This is just a random selection of configuration options.
@@ -54,3 +54,9 @@ options {
 	serial-query-rate 100;
 	server-id none;
 };
+
+zone "example1" {
+	type master;
+	file "xxx";
+	update-policy local;
+};
diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index 8444664b76a27ad087ae054d8fa7c32aadc6f464..89f6e90aeaf2789aaf31d9dcb4586088abd5bcf4 100644
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.3 2007/06/19 23:47:01 tbox Exp $
+# $Id: tests.sh,v 1.4 2010/06/02 01:07:47 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -26,6 +26,11 @@ $CHECKCONF good.conf > /dev/null 2>&1 || ret=1
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+echo "I: checking that named-checkconf prints a known good config"
+ret=0
+$CHECKCONF -p good.conf > /dev/null 2>&1 || ret=1
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
 echo "I: checking that named-checkconf handles a known bad config"
 
 ret=1