diff --git a/CHANGES b/CHANGES
index 276b149c8f751a64e0bc732d042c6c7c0707ce07..9be64d749fe37feffb0dd1ea2069195c6ef62722 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,93 @@
 ===
 ==============================================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 18.4.0 to Asterisk 18.5.0 ------------
+------------------------------------------------------------------------------
+
+AMI Flash event
+------------------
+ * Hook flash events are now exposed as AMI events.
+
+Add variable support to Originate
+------------------
+ * The Originate application now allows
+   variables to be set on the new channel
+   through a new option.
+
+MessageSend
+------------------
+ * The MessageSend dialplan application now takes an
+   optional third argument that can set the message's
+   "To" field on outgoing messages.  It's an alternative
+   to using the MESSAGE(to) dialplan function.
+
+   To prevent confusion with the first argument, currently
+   named "to", it's been renamed to "destination".
+   Its function, creating the request URI, hasn't changed.
+
+   The online documentation has also been enhanced to
+   explain the behavior.
+
+   Despite the changes in this commit, there should be
+   no impact to current users of MessageSend.
+
+New ConfKick application
+------------------
+ * Adds a ConfKick() application, which allows
+   a specific channel, all users, or all non-admin
+   users to be kicked from a conference bridge.
+
+app_confbridge answer supervision control
+------------------
+ * app_confbridge now provides a user option to prevent
+   answer supervision if the channel hasn't been
+   answered yet. To use it, set a user profile's
+   answer_channel option to no.
+
+app_voicemail
+------------------
+ * You can now customize the "beep" tone or omit it entirely.
+
+func_math: Three new dialplan functions
+------------------
+ * Introduce three new functions, MIN, MAX, and ABS, which can be used to
+   obtain the minimum or maximum of up to two integers or absolute value.
+
+func_volume now can be read
+------------------
+ * The VOLUME function can now also be used
+   to read existing values previously set.
+
+res_pjsip
+------------------
+ * PJSIP support of registrations of endpoints in multidomain
+   scenarios, where the endpoint contains the domain info
+   in pjsip_endpoint.conf
+
+res_pjsip_dialog_info_body_generator
+------------------
+ * PJSIP now supports RFC 4235 Section 4.1.6 dialog-info+xml local and
+   remote elements by iterating through ringing channels and inserting
+   that info into NOTIFY packet sent to the endpoint.
+
+res_pjsip_messaging
+------------------
+ * Implemented the new "to" parameter of the MessageSend()
+   dialplan application.  This allows a user to specify
+   a complete SIP "To" header separate from the Request URI.
+   We now also accept a destination in the same format
+   as Dial()...  PJSIP/number@endpoint
+
+res_rtp_asterisk
+------------------
+ * By default Asterisk reports the PJSIP version in all
+   STUN packets it sends.
+
+   This behaviour may not be desired in a production
+   environment and can now be disabled by setting the
+   stun_software_attribute option to 'no' in rtp.conf.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 18.3.0 to Asterisk 18.4.0 ------------
 ------------------------------------------------------------------------------
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 5782164529d352a6bb4cf0817ac054883441edcc..672c5e3251fba472555bf95d909618b4a95e05d7 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -18,6 +18,24 @@
 ===
 ===========================================================
 
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 18.4.0 to Asterisk 18.5.0 ------------
+------------------------------------------------------------------------------
+
+STIR/SHAKEN
+------------------
+ * The configuration option public_key_url in stir_shaken.conf
+   has been renamed to public_cert_url to better fit what it
+   contains. Only the name has changed - functionality is the
+   same.
+
+ * STIR/SHAKEN originally needed an origid to be specified in
+   stir_shaken.conf under the certificate config object in
+   order to work. Now, one is automatically created by
+   generating a UUID, as recommended by RFC8588. Any origid
+   you have in your stir_shaken.conf will need to be removed
+   for the module to read in certificates.
+
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 18.3.0 to Asterisk 18.4.0 ------------
 ------------------------------------------------------------------------------
diff --git a/doc/CHANGES-staging/app_confbridge_answer.txt b/doc/CHANGES-staging/app_confbridge_answer.txt
deleted file mode 100644
index b975f48f4ed8272ede72a225f7835f7c7381af2b..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/app_confbridge_answer.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Subject: app_confbridge answer supervision control
-
-app_confbridge now provides a user option to prevent
-answer supervision if the channel hasn't been
-answered yet. To use it, set a user profile's
-answer_channel option to no.
diff --git a/doc/CHANGES-staging/app_confkick.txt b/doc/CHANGES-staging/app_confkick.txt
deleted file mode 100644
index 4250c7d6badda83d894939ecf996ced122287a3d..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/app_confkick.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Subject: New ConfKick application
-
-Adds a ConfKick() application, which allows
-a specific channel, all users, or all non-admin
-users to be kicked from a conference bridge.
-
diff --git a/doc/CHANGES-staging/app_originate_vars.txt b/doc/CHANGES-staging/app_originate_vars.txt
deleted file mode 100644
index 4e08ae61f82a1184a0968672ac6e3d1c14e85a61..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/app_originate_vars.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Subject: Add variable support to Originate
-
-The Originate application now allows
-variables to be set on the new channel
-through a new option.
-
diff --git a/doc/CHANGES-staging/flash_ami_event.txt b/doc/CHANGES-staging/flash_ami_event.txt
deleted file mode 100644
index 4cbea80683182d2ad44826242cd1316d708c433f..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/flash_ami_event.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Subject: AMI Flash event
-
-Hook flash events are now exposed as AMI events.
diff --git a/doc/CHANGES-staging/func_min_max.txt b/doc/CHANGES-staging/func_min_max.txt
deleted file mode 100644
index df2b6653e0ac4be6342df63c1c3c4647e4a559ef..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/func_min_max.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Subject: func_math: Three new dialplan functions
-
-Introduce three new functions, MIN, MAX, and ABS, which can be used to
-obtain the minimum or maximum of up to two integers or absolute value.
diff --git a/doc/CHANGES-staging/func_volume_read.txt b/doc/CHANGES-staging/func_volume_read.txt
deleted file mode 100644
index 8ea27cdce3da173719d136fa88ae1ee51ce3cba0..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/func_volume_read.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Subject: func_volume now can be read
-
-The VOLUME function can now also be used
-to read existing values previously set.
diff --git a/doc/CHANGES-staging/messagesend.txt b/doc/CHANGES-staging/messagesend.txt
deleted file mode 100644
index 7977ff15c848492feac32071844d5a8a6da88a7f..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/messagesend.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Subject: MessageSend
-
-The MessageSend dialplan application now takes an
-optional third argument that can set the message's
-"To" field on outgoing messages.  It's an alternative
-to using the MESSAGE(to) dialplan function.
-
-To prevent confusion with the first argument, currently
-named "to", it's been renamed to "destination".
-Its function, creating the request URI, hasn't changed.
-
-The online documentation has also been enhanced to
-explain the behavior.
-
-Despite the changes in this commit, there should be
-no impact to current users of MessageSend.
diff --git a/doc/CHANGES-staging/res_pjsip.txt b/doc/CHANGES-staging/res_pjsip.txt
deleted file mode 100644
index ffbf13a9c2e994e50612b0caf823c4ebdf248c24..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/res_pjsip.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Subject: res_pjsip
-
-PJSIP support of registrations of endpoints in multidomain
-scenarios, where the endpoint contains the domain info
-in pjsip_endpoint.conf
diff --git a/doc/CHANGES-staging/res_pjsip_dialog_info_body_generator.txt b/doc/CHANGES-staging/res_pjsip_dialog_info_body_generator.txt
deleted file mode 100644
index 0dd0a5762ddd481a94e971b854370bc3024d1f6d..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/res_pjsip_dialog_info_body_generator.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Subject: res_pjsip_dialog_info_body_generator
-
-PJSIP now supports RFC 4235 Section 4.1.6 dialog-info+xml local and
-remote elements by iterating through ringing channels and inserting
-that info into NOTIFY packet sent to the endpoint.
diff --git a/doc/CHANGES-staging/res_pjsip_dtmf.txt b/doc/CHANGES-staging/res_pjsip_dtmf.txt
deleted file mode 100644
index 4dc2088c6f8ff1dd6d0c34d556551759de1bc797..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/res_pjsip_dtmf.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-res_pjsip_dtmf_info: Hook flash
-
-Adds recognition for application/
-hook-flash as a hook flash event.
-
diff --git a/doc/CHANGES-staging/res_pjsip_messaging.txt b/doc/CHANGES-staging/res_pjsip_messaging.txt
deleted file mode 100644
index 46874dc55d4914f31c978947f1c92481587f4e02..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/res_pjsip_messaging.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Subject: res_pjsip_messaging
-
-Implemented the new "to" parameter of the MessageSend()
-dialplan application.  This allows a user to specify
-a complete SIP "To" header separate from the Request URI.
-We now also accept a destination in the same format
-as Dial()...  PJSIP/number@endpoint
diff --git a/doc/CHANGES-staging/res_rtp_asterisk_stun_software_attribute.txt b/doc/CHANGES-staging/res_rtp_asterisk_stun_software_attribute.txt
deleted file mode 100644
index 93905f6d0af8607ab5c58b38e2e948cb59be51cd..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/res_rtp_asterisk_stun_software_attribute.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: res_rtp_asterisk
-
-By default Asterisk reports the PJSIP version in all
-STUN packets it sends.
-
-This behaviour may not be desired in a production
-environment and can now be disabled by setting the
-stun_software_attribute option to 'no' in rtp.conf.
diff --git a/doc/CHANGES-staging/voicemail_beep.txt b/doc/CHANGES-staging/voicemail_beep.txt
deleted file mode 100644
index d98b40356f5243730b0633436717a7a9abab5017..0000000000000000000000000000000000000000
--- a/doc/CHANGES-staging/voicemail_beep.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Subject: app_voicemail
-
-You can now customize the "beep" tone or omit it entirely.
diff --git a/doc/UPGRADE-staging/stir-shaken-public-key-url.txt b/doc/UPGRADE-staging/stir-shaken-public-key-url.txt
deleted file mode 100644
index 094bccfe72fdcc9917fde5508b28721ebae3b064..0000000000000000000000000000000000000000
--- a/doc/UPGRADE-staging/stir-shaken-public-key-url.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Subject: STIR/SHAKEN
-
-The configuration option public_key_url in stir_shaken.conf
-has been renamed to public_cert_url to better fit what it
-contains. Only the name has changed - functionality is the
-same.
diff --git a/doc/UPGRADE-staging/stir_shaken_origid.txt b/doc/UPGRADE-staging/stir_shaken_origid.txt
deleted file mode 100644
index f0b897757f49f603174b0d69d4749e45f886add5..0000000000000000000000000000000000000000
--- a/doc/UPGRADE-staging/stir_shaken_origid.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Subject: STIR/SHAKEN
-
-STIR/SHAKEN originally needed an origid to be specified in
-stir_shaken.conf under the certificate config object in
-order to work. Now, one is automatically created by
-generating a UUID, as recommended by RFC8588. Any origid
-you have in your stir_shaken.conf will need to be removed
-for the module to read in certificates.