diff --git a/.version b/.version
index 14cb73647d6015c8ad705a14c5bad2cc6a710734..844f73c5d0767bbd92ab5a2fab74f2762275af84 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-20.4.0-rc1
+20.4.0-rc2
diff --git a/CHANGES.md b/CHANGES.md
index 56b1d7f0bde378203348302da60b4b6ec57d32a3..43f1ea90a34c3af6a8f6b889135787c44c3bf809 120000
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1 +1 @@
-ChangeLogs/ChangeLog-20.4.0-rc1.md
\ No newline at end of file
+ChangeLogs/ChangeLog-20.4.0-rc2.md
\ No newline at end of file
diff --git a/ChangeLogs/ChangeLog-20.4.0-rc2.md b/ChangeLogs/ChangeLog-20.4.0-rc2.md
new file mode 100644
index 0000000000000000000000000000000000000000..c20dde02a8b40fa4bc18eaa598f7d82a9e3924ce
--- /dev/null
+++ b/ChangeLogs/ChangeLog-20.4.0-rc2.md
@@ -0,0 +1,62 @@
+
+Change Log for Release 20.4.0-rc2
+========================================
+
+Links:
+----------------------------------------
+
+ - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-20.4.0-rc2.md)  
+ - [GitHub Diff](https://github.com/asterisk/asterisk/compare/20.4.0-rc1...20.4.0-rc2)  
+ - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-20.4.0-rc2.tar.gz)  
+ - [Downloads](https://downloads.asterisk.org/pub/telephony/asterisk)  
+
+Summary:
+----------------------------------------
+
+- app.h: Move declaration of ast_getdata_result before its first use
+- doc: Remove obsolete CHANGES-staging and UPGRADE-staging
+
+User Notes:
+----------------------------------------
+
+
+Upgrade Notes:
+----------------------------------------
+
+
+Closed Issues:
+----------------------------------------
+
+  - #200: [bug]: Regression: In app.h an enum is used before its declaration.
+
+Commits By Author:
+----------------------------------------
+
+- ### George Joseph (2):
+  - doc: Remove obsolete CHANGES-staging and UPGRADE-staging
+  - app.h: Move declaration of ast_getdata_result before its first use
+
+
+Detail:
+----------------------------------------
+
+- ### app.h: Move declaration of ast_getdata_result before its first use
+  Author: George Joseph  
+  Date:   2023-07-10  
+
+  The ast_app_getdata() and ast_app_getdata_terminator() declarations
+  in app.h were changed recently to return enum ast_getdata_result
+  (which is how they were defined in app.c).  The existing
+  declaration of ast_getdata_result in app.h was about 1000 lines
+  after those functions however so under certain circumstances,
+  a "use before declaration" error was thrown by the compiler.
+  The declaration of the enum was therefore moved to before those
+  functions.
+
+  Resolves: #200
+
+- ### doc: Remove obsolete CHANGES-staging and UPGRADE-staging
+  Author: George Joseph  
+  Date:   2023-07-10  
+
+