diff --git a/java/core/src/main/resources/google/protobuf/java_features.proto b/java/core/src/main/resources/google/protobuf/java_features.proto
index daae8fe1e1..bbf441c06a 100644
--- a/java/core/src/main/resources/google/protobuf/java_features.proto
+++ b/java/core/src/main/resources/google/protobuf/java_features.proto
@@ -57,7 +57,7 @@ message JavaFeatures {
     targets = TARGET_TYPE_FILE,
     feature_support = {
       edition_introduced: EDITION_2023,
-      edition_deprecated: EDITION_2023,
+      edition_deprecated: EDITION_2024,
       deprecation_warning: "The Java-specific utf8 validation feature is "
                            "deprecated and is scheduled to be removed in "
                            "edition 2025.  Utf8 validation behavior should "
diff --git a/src/google/protobuf/compiler/java/java_features.pb.cc b/src/google/protobuf/compiler/java/java_features.pb.cc
index e6adeaad5c..bcd958009f 100644
--- a/src/google/protobuf/compiler/java/java_features.pb.cc
+++ b/src/google/protobuf/compiler/java/java_features.pb.cc
@@ -85,7 +85,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fjava_2fjava_
     "nitions themselves rather than on fields"
     ".\022\237\002\n\017utf8_validation\030\002 \001(\0162\037.pb.JavaFea"
     "tures.Utf8ValidationB\344\001\210\001\001\230\001\004\230\001\001\242\001\014\022\007DEF"
-    "AULT\030\204\007\262\001\310\001\010\350\007\020\350\007\032\277\001The Java-specific ut"
+    "AULT\030\204\007\262\001\310\001\010\350\007\020\351\007\032\277\001The Java-specific ut"
     "f8 validation feature is deprecated and "
     "is scheduled to be removed in edition 20"
     "25.  Utf8 validation behavior should use"