diff --git a/Atffile b/Atffile
index 43ec8b5227..f27e3ab560 100644
--- a/Atffile
+++ b/Atffile
@@ -2,4 +2,3 @@ Content-Type: application/X-atf-atffile; version="1"
prop: test-suite = bind9
-tp: lib
diff --git a/CHANGES b/CHANGES
index ba22d0708d..4aa469be1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ --- 9.9.13rc2 released ---
+
4984. [bug] Improve handling of very large incremental
zone transfers to prevent journal corruption. [GL #339]
diff --git a/Kyuafile b/Kyuafile
index 70b2cffe17..9131980d03 100644
--- a/Kyuafile
+++ b/Kyuafile
@@ -1,4 +1,3 @@
syntax(2)
test_suite('bind9')
-include('lib/Kyuafile')
diff --git a/bin/named/named.conf.5 b/bin/named/named.conf.5
index 57d01fc3a0..53aaa1e04b 100644
--- a/bin/named/named.conf.5
+++ b/bin/named/named.conf.5
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2004-2011, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
.\"
.\" Permission to use, copy, modify, and/or distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -18,12 +18,12 @@
.\" Title: named.conf
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 2016-12-02
+.\" Date: 2018-06-21
.\" Manual: BIND9
.\" Source: ISC
.\" Language: English
.\"
-.TH "NAMED\&.CONF" "5" "2016\-12\-02" "ISC" "BIND9"
+.TH "NAMED\&.CONF" "5" "2018\-06\-21" "ISC" "BIND9"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -349,6 +349,7 @@ options {
\&.\&.\&. } [ recursive\-only \fIboolean\fR ] [ break\-dnssec \fIboolean\fR ] [
max\-policy\-ttl \fIinteger\fR ] [ min\-ns\-dots \fIinteger\fR ];
root\-delegation\-only [ exclude { \fIquoted_string\fR; \&.\&.\&. } ];
+ root\-key\-sentinel \fIboolean\fR;
rrset\-order { [ class \fIstring\fR ] [ type \fIstring\fR ] [ name
\fIquoted_string\fR ] \fIstring\fR \fIstring\fR; \&.\&.\&. };
secroots\-file \fIquoted_string\fR;
@@ -600,6 +601,7 @@ view \fIstring\fR [ \fIclass\fR ] {
\&.\&.\&. } [ recursive\-only \fIboolean\fR ] [ break\-dnssec \fIboolean\fR ] [
max\-policy\-ttl \fIinteger\fR ] [ min\-ns\-dots \fIinteger\fR ];
root\-delegation\-only [ exclude { \fIquoted_string\fR; \&.\&.\&. } ];
+ root\-key\-sentinel \fIboolean\fR;
rrset\-order { [ class \fIstring\fR ] [ type \fIstring\fR ] [ name
\fIquoted_string\fR ] \fIstring\fR \fIstring\fR; \&.\&.\&. };
serial\-update\-method ( increment | unixtime );
@@ -850,5 +852,5 @@ BIND 9 Administrator Reference Manual\&.
\fBInternet Systems Consortium, Inc\&.\fR
.SH "COPYRIGHT"
.br
-Copyright \(co 2004-2011, 2013-2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright \(co 2004-2018 Internet Systems Consortium, Inc. ("ISC")
.br
diff --git a/bin/named/named.conf.docbook b/bin/named/named.conf.docbook
index 3ea9c8259a..c7fe5473ea 100644
--- a/bin/named/named.conf.docbook
+++ b/bin/named/named.conf.docbook
@@ -18,7 +18,7 @@
- 2016-12-02
+ 2018-06-21
ISC
@@ -337,6 +337,7 @@ options {
... } [ recursive-only boolean ] [ break-dnssec boolean ] [
max-policy-ttl integer ] [ min-ns-dots integer ];
root-delegation-only [ exclude { quoted_string; ... } ];
+ root-key-sentinel boolean;
rrset-order { [ class string ] [ type string ] [ name
quoted_string ] string string; ... };
secroots-file quoted_string;
@@ -572,6 +573,7 @@ view string [ class ] {
... } [ recursive-only boolean ] [ break-dnssec boolean ] [
max-policy-ttl integer ] [ min-ns-dots integer ];
root-delegation-only [ exclude { quoted_string; ... } ];
+ root-key-sentinel boolean;
rrset-order { [ class string ] [ type string ] [ name
quoted_string ] string string; ... };
serial-update-method ( increment | unixtime );
diff --git a/bin/named/named.conf.html b/bin/named/named.conf.html
index c61aaad21c..092960af4b 100644
--- a/bin/named/named.conf.html
+++ b/bin/named/named.conf.html
@@ -1,6 +1,6 @@