diff --git a/.version b/.version
index 54d3ad7364..0fac3b01f5 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-21.3.0
+21.3.1
diff --git a/CHANGES.md b/CHANGES.md
index bdc28203b0..683bc55834 120000
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1 +1 @@
-ChangeLogs/ChangeLog-21.3.0.md
\ No newline at end of file
+ChangeLogs/ChangeLog-21.3.1.md
\ No newline at end of file
diff --git a/ChangeLogs/ChangeLog-21.3.1.md b/ChangeLogs/ChangeLog-21.3.1.md
new file mode 100644
index 0000000000..edea218f21
--- /dev/null
+++ b/ChangeLogs/ChangeLog-21.3.1.md
@@ -0,0 +1,53 @@
+
+## Change Log for Release asterisk-21.3.1
+
+### Links:
+
+ - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-21.3.1.md)  
+ - [GitHub Diff](https://github.com/asterisk/asterisk/compare/21.3.0...21.3.1)  
+ - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-21.3.1.tar.gz)  
+ - [Downloads](https://downloads.asterisk.org/pub/telephony/asterisk)  
+
+### Summary:
+
+- Commits: 1
+- Commit Authors: 1
+- Issues Resolved: 0
+- Security Advisories Resolved: 1
+  - [GHSA-qqxj-v78h-hrf9](https://github.com/asterisk/asterisk/security/advisories/GHSA-qqxj-v78h-hrf9): res_pjsip_endpoint_identifier_ip: wrongly matches ALL unauthorized SIP requests
+
+### User Notes:
+
+
+### Upgrade Notes:
+
+
+### Commit Authors:
+
+- George Joseph: (1)
+
+## Issue and Commit Detail:
+
+### Closed Issues:
+
+  - !GHSA-qqxj-v78h-hrf9: res_pjsip_endpoint_identifier_ip: wrongly matches ALL unauthorized SIP requests
+
+### Commits By Author:
+
+- ### George Joseph (1):
+  - Revert "res_pjsip_endpoint_identifier_ip: Add endpoint identifier transport ad..
+
+
+### Commit List:
+
+
+### Commit Details:
+
+#### Revert "res_pjsip_endpoint_identifier_ip: Add endpoint identifier transport ad..
+  Author: George Joseph
+  Date:   2024-05-17
+
+  This reverts PR #602
+
+  Resolves: #GHSA-qqxj-v78h-hrf9
+
diff --git a/contrib/realtime/mysql/mysql_config.sql b/contrib/realtime/mysql/mysql_config.sql
index 0252a4b356..83fee776b5 100644
--- a/contrib/realtime/mysql/mysql_config.sql
+++ b/contrib/realtime/mysql/mysql_config.sql
@@ -1685,3 +1685,9 @@ ALTER TABLE ps_registrations MODIFY id VARCHAR(255) NOT NULL;
 
 UPDATE alembic_version SET version_num='6c475a93f48a' WHERE alembic_version.version_num = 'd5122576cca8';
 
+-- Running upgrade 6c475a93f48a -> bd9c5159c7ea
+
+ALTER TABLE ps_endpoint_id_ips DROP COLUMN transport;
+
+UPDATE alembic_version SET version_num='bd9c5159c7ea' WHERE alembic_version.version_num = '6c475a93f48a';
+
diff --git a/contrib/realtime/postgresql/postgresql_config.sql b/contrib/realtime/postgresql/postgresql_config.sql
index 5b855d84af..38395ec296 100644
--- a/contrib/realtime/postgresql/postgresql_config.sql
+++ b/contrib/realtime/postgresql/postgresql_config.sql
@@ -1807,5 +1807,11 @@ ALTER TABLE ps_registrations ALTER COLUMN id SET NOT NULL;
 
 UPDATE alembic_version SET version_num='6c475a93f48a' WHERE alembic_version.version_num = 'd5122576cca8';
 
+-- Running upgrade 6c475a93f48a -> bd9c5159c7ea
+
+ALTER TABLE ps_endpoint_id_ips DROP COLUMN transport;
+
+UPDATE alembic_version SET version_num='bd9c5159c7ea' WHERE alembic_version.version_num = '6c475a93f48a';
+
 COMMIT;