diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index da2d96af4d0..4cffeca7764 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,25 @@
This document describes the changes made to the ERTS application.
+Erts 12.1.2
+
+ Improvements and New Features
+
+ -
+
+ The python scripts that existed in
+ erts/lib_src/yielding_c_fun/lib/tiny_regex_c/scripts had
+ a license that was incompatible with Erlang/OTP's
+ license. This ticket removes these scripts that were not
+ used by us.
+
+ Own Id: OTP-17658
+
+
+
+
+
+
Erts 12.1.1
Fixed Bugs and Malfunctions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index a9ffb183b66..a33a408310c 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 12.1.1
+VSN = 12.1.2
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 32010194198..ee9c940421e 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -31,6 +31,28 @@
This document describes the changes made to the Crypto application.
+Crypto 5.0.4
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Fixed minor memory leak at crypto module purge.
+
+ Own Id: OTP-17668 Aux Id: PR-5245
+
+ -
+
+ Fix possible inconsistency in fips mode when linking with
+ some cryptolibs.
+
+ Own Id: OTP-17672
+
+
+
+
+
+
Crypto 5.0.3
Fixed Bugs and Malfunctions
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index d0459ce9245..806bd620b58 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.0.3
+CRYPTO_VSN = 5.0.4
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 934f0629bf1..fb348c06f38 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,25 @@
This document describes the changes made to the Kernel application.
+Kernel 8.1.2
+
+ Fixed Bugs and Malfunctions
+
+ -
+
The undocumented DNS encode/decode module
+ inet_dns has been cleaned up to handle the
+ difference between "symbolic" and "raw" records in a more
+ consistent manner.
PR-5145/OTP-17584 introduced a
+ change that contributed to an already existing confusion,
+ which this correction should remedy.
+
+ Own Id: OTP-17659 Aux Id: ERIERL-702
+
+
+
+
+
+
Kernel 8.1.1
Fixed Bugs and Malfunctions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index bbafb4f8fba..d05a2bb07e5 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -50,7 +50,8 @@
{<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.1$">>,[restart_new_emulator]},
- {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
[{<<"^6\\.4$">>,[restart_new_emulator]},
{<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -73,4 +74,5 @@
{<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.1$">>,[restart_new_emulator]},
- {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+ {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^8\\.1\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index b2d30db8a74..af7a6144275 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.1.1
+KERNEL_VSN = 8.1.2
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 7ad4acae51c..beb1f0845ab 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,24 @@
notes.xml
+Public_Key 1.11.3
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Avoid re-encoding of decoded certificates. This could
+ cause unexpected failures as some subtle encoding errors
+ can be tolerated when decoding but hence creating another
+ sequence of bytes if the decoded value is re-encoded.
+
+ Own Id: OTP-17657
+
+
+
+
+
+
Public_Key 1.11.2
Fixed Bugs and Malfunctions
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index a35a1c39067..262e927fce8 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.11.2
+PUBLIC_KEY_VSN = 1.11.3
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 7d2c3e621a0..7ca6cc2e5be 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,46 @@
This document describes the changes made to the SSL application.
+SSL 10.5.1
+
+ Fixed Bugs and Malfunctions
+
+ -
+
+ Before that change, TLS downgrade could occasionally fail
+ when data intended for downgraded socket were delivered
+ together with CLOSE_NOTIFY alert to ssl app.
+
+ Own Id: OTP-17393
+
+ -
+
+ Avoid re-encoding of decoded certificates. This could
+ cause unexpected failures as some subtle encoding errors
+ can be tolerated when decoding but hence creating another
+ sequence of bytes if the decoded value is re-encoded.
+
+ Own Id: OTP-17657
+
+ -
+
+ Fix possible process leak when the process doing
+ ssl:transport_accept dies before initiating the TLS
+ handshake.
+
+ Own Id: OTP-17666 Aux Id: GH-5239
+
+ -
+
+ Fix dtls memory leak, the replay window code was broken.
+
+ Own Id: OTP-17670 Aux Id: GH-5224
+
+
+
+
+
+
SSL 10.5
Fixed Bugs and Malfunctions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index f325e71a115..d7615208568 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -84,6 +84,6 @@
{applications, [crypto, public_key, kernel, stdlib]},
{env, []},
{mod, {ssl_app, []}},
- {runtime_dependencies, ["stdlib-3.12","public_key-@OTP-17657@","kernel-8.0",
+ {runtime_dependencies, ["stdlib-3.12","public_key-1.11.3","kernel-8.0",
"erts-10.0","crypto-5.0", "inets-5.10.7",
"runtime_tools-1.15.1"]}]}.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index ada4a426a30..8f1847a5be2 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.5
+SSL_VSN = 10.5.1
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 775591c8b29..553ca835d25 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,8 +1,8 @@
-OTP-17640
-OTP-17641
-OTP-17642
-OTP-17646
-OTP-17647
-OTP-17649
-OTP-17651
-OTP-17665
+OTP-17393
+OTP-17657
+OTP-17658
+OTP-17659
+OTP-17666
+OTP-17668
+OTP-17670
+OTP-17672