diff --git a/CHANGES b/CHANGES
index 83ba40f6d4..33d4fd1adf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,20 @@
 ===
 ==============================================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk certified/16.8-cert5 to Asterisk certified/16.8-cert6 
+------------------------------------------------------------------------------
+
+res_srtp
+------------------
+ * SRTP replay protection has been added to res_srtp and
+   a new configuration option "srtpreplayprotection" has
+   been added to the rtp.conf config file.  For security
+   reasons, the default setting is "yes".  Buggy clients
+   may not handle this correctly which could result in
+   no, or one way, audio and Asterisk error messages like
+   "replay check failed".
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk certified/16.8-cert3 to Asterisk certified/16.8-cert4 
 ------------------------------------------------------------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index e7a3d5de41..a5c7add04d 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -18,6 +18,20 @@
 ===
 ===========================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk certified/16.8-cert5 to Asterisk certified/16.8-cert6 
+------------------------------------------------------------------------------
+
+res_srtp
+------------------
+ * SRTP replay protection has been added to res_srtp and
+   a new configuration option "srtpreplayprotection" has
+   been added to the rtp.conf config file.  For security
+   reasons, the default setting is "yes".  Buggy clients
+   may not handle this correctly which could result in
+   no, or one way, audio and Asterisk error messages like
+   "replay check failed".
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 16.6.1 to Asterisk 16.6.2 ------------
 ------------------------------------------------------------------------------
diff --git a/doc/CHANGES-staging/srtp_replay_protection.txt b/doc/CHANGES-staging/srtp_replay_protection.txt
deleted file mode 100644
index 945ddb5704..0000000000
--- a/doc/CHANGES-staging/srtp_replay_protection.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: res_srtp
-
-SRTP replay protection has been added to res_srtp and
-a new configuration option "srtpreplayprotection" has
-been added to the rtp.conf config file.  For security
-reasons, the default setting is "yes".  Buggy clients
-may not handle this correctly which could result in
-no, or one way, audio and Asterisk error messages like
-"replay check failed".
diff --git a/doc/UPGRADE-staging/srtp_replay_protection.txt b/doc/UPGRADE-staging/srtp_replay_protection.txt
deleted file mode 100644
index 945ddb5704..0000000000
--- a/doc/UPGRADE-staging/srtp_replay_protection.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Subject: res_srtp
-
-SRTP replay protection has been added to res_srtp and
-a new configuration option "srtpreplayprotection" has
-been added to the rtp.conf config file.  For security
-reasons, the default setting is "yes".  Buggy clients
-may not handle this correctly which could result in
-no, or one way, audio and Asterisk error messages like
-"replay check failed".