diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index add2014f8b8..46c2196eff1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -59,6 +59,8 @@ New Features
 Bug Fixes
 ----------------------
 
+* SOLR-12103: Raise CryptoKeys.DEFAULT_KEYPAIR_LENGTH from 1024 to 2048. (Mark Miller)
+
 Optimizations
 ----------------------
 
diff --git a/solr/core/src/java/org/apache/solr/util/CryptoKeys.java b/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
index 1122860e73b..faf67fda306 100644
--- a/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
+++ b/solr/core/src/java/org/apache/solr/util/CryptoKeys.java
@@ -287,8 +287,8 @@ public final class CryptoKeys {
 
     // If this ever comes back to haunt us see the discussion at
     // SOLR-9609 for background and code allowing this to go
-    // into security.json
-    private static final int DEFAULT_KEYPAIR_LENGTH = 1024;
+    // into security.json. Also see SOLR-12103.
+    private static final int DEFAULT_KEYPAIR_LENGTH = 2048;
 
     public RSAKeyPair() {
       KeyPairGenerator keyGen = null;