diff --git a/CHANGES b/CHANGES
index e07fde105d..7e242fad24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,37 @@
 ===
 ==============================================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 16.29.0 to Asterisk 16.30.0 ----------
+------------------------------------------------------------------------------
+
+cdr
+------------------
+ * Two new options have been added which allow
+   bridging and dial state changes to be ignored
+   in CDRs, which can be useful if a single CDR
+   is desired for a channel.
+
+res_pjsip
+------------------
+ * Added options "security_negotiation" and "security_mechanisms" to pjsip
+   endpoints and registrations. "security_negotiation" can be set to "no" (default)
+   or "mediasec", and "security_mechanisms" can be a list of comma-separated
+   security_mechanisms in the form defined by RFC 3329 section 2.2.
+
+ * A new option named "all_codecs_on_empty_reinvite" has been added to the
+   global section. When this option is enabled, on reception of a re-INVITE
+   without SDP, Asterisk will send an SDP offer in the 200 OK response containing
+   all configured codecs on the endpoint, instead of simply those that have
+   already been negotiated. RFC 3261 specifies this as a SHOULD requirement.
+   The default value is "off".
+
+res_tonedetect
+------------------
+ * The TONE_DETECT function now supports
+   detection of audible ringback tone
+   using the p option.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 16.28.0 to Asterisk 16.29.0 ----------
 ------------------------------------------------------------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index be0d413844..40eb8fdaeb 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -18,6 +18,19 @@
 ===
 ===========================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 16.29.0 to Asterisk 16.30.0 ----------
+------------------------------------------------------------------------------
+
+AMI (Asterisk Manager Interface)
+------------------
+ * Previously, GetConfig and UpdateConfig were able to access files outside of
+   the Asterisk configuration directory. Now this access is put behind the
+   live_dangerously configuration option in asterisk.conf, which is disabled by
+   default. If access to configuration files outside of the Asterisk configuation
+   directory is required via AMI, then the live_dangerously configuration option
+   must be set to yes.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 16.28.0 to Asterisk 16.29.0 ----------
 ------------------------------------------------------------------------------
diff --git a/doc/CHANGES-staging/cdr_ignore.txt b/doc/CHANGES-staging/cdr_ignore.txt
deleted file mode 100644
index e82f40415a..0000000000
--- a/doc/CHANGES-staging/cdr_ignore.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Subject: cdr
-
-Two new options have been added which allow
-bridging and dial state changes to be ignored
-in CDRs, which can be useful if a single CDR
-is desired for a channel.
diff --git a/doc/CHANGES-staging/res_pjsip_all_codecs_on_empty_reinvite_option.txt b/doc/CHANGES-staging/res_pjsip_all_codecs_on_empty_reinvite_option.txt
deleted file mode 100644
index 99eccbb512..0000000000
--- a/doc/CHANGES-staging/res_pjsip_all_codecs_on_empty_reinvite_option.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: res_pjsip
-
-A new option named "all_codecs_on_empty_reinvite" has been added to the
-global section. When this option is enabled, on reception of a re-INVITE
-without SDP, Asterisk will send an SDP offer in the 200 OK response containing
-all configured codecs on the endpoint, instead of simply those that have
-already been negotiated. RFC 3261 specifies this as a SHOULD requirement.
-The default value is "off".
\ No newline at end of file
diff --git a/doc/CHANGES-staging/res_pjsip_rfc3329.txt b/doc/CHANGES-staging/res_pjsip_rfc3329.txt
deleted file mode 100644
index 06510b5661..0000000000
--- a/doc/CHANGES-staging/res_pjsip_rfc3329.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Subject: res_pjsip
-
-Added options "security_negotiation" and "security_mechanisms" to pjsip
-endpoints and registrations. "security_negotiation" can be set to "no" (default)
-or "mediasec", and "security_mechanisms" can be a list of comma-separated
-security_mechanisms in the form defined by RFC 3329 section 2.2.
diff --git a/doc/CHANGES-staging/res_tonedetect_ring.txt b/doc/CHANGES-staging/res_tonedetect_ring.txt
deleted file mode 100644
index e5e4c2e232..0000000000
--- a/doc/CHANGES-staging/res_tonedetect_ring.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Subject: res_tonedetect
-
-The TONE_DETECT function now supports
-detection of audible ringback tone
-using the p option.
diff --git a/doc/UPGRADE-staging/manager_config_live_dangerously.txt b/doc/UPGRADE-staging/manager_config_live_dangerously.txt
deleted file mode 100644
index 56f39f9c8d..0000000000
--- a/doc/UPGRADE-staging/manager_config_live_dangerously.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: AMI (Asterisk Manager Interface)
-
-Previously, GetConfig and UpdateConfig were able to access files outside of
-the Asterisk configuration directory. Now this access is put behind the
-live_dangerously configuration option in asterisk.conf, which is disabled by
-default. If access to configuration files outside of the Asterisk configuation
-directory is required via AMI, then the live_dangerously configuration option
-must be set to yes.