diff --git a/csharp/BUILD.bazel b/csharp/BUILD.bazel
index 9b7561944e..6ae0625908 100644
--- a/csharp/BUILD.bazel
+++ b/csharp/BUILD.bazel
@@ -127,7 +127,7 @@ compile_edition_defaults(
     srcs = [
         "//:descriptor_proto",
     ],
-    maximum_edition = "2024",
+    maximum_edition = "2026",
     minimum_edition = "PROTO2",
 )
 
diff --git a/csharp/google/protobuf/c_sharp_features.proto b/csharp/google/protobuf/c_sharp_features.proto
index f26300f168..883de2a575 100644
--- a/csharp/google/protobuf/c_sharp_features.proto
+++ b/csharp/google/protobuf/c_sharp_features.proto
@@ -29,7 +29,7 @@ message CSharpFeatures {
     targets = TARGET_TYPE_MESSAGE,
     targets = TARGET_TYPE_FILE,
     feature_support = {
-      edition_introduced: EDITION_UNSTABLE,
+      edition_introduced: EDITION_2026,
     },
     edition_defaults = { edition: EDITION_LEGACY, value: "false" }
   ];
diff --git a/csharp/protos/nrt.proto b/csharp/protos/nrt.proto
index 00b7f22978..dfeaabb2c9 100644
--- a/csharp/protos/nrt.proto
+++ b/csharp/protos/nrt.proto
@@ -5,7 +5,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-edition = "UNSTABLE";
+edition = "2026";
 
 package protobuf_editionstesting;
 
diff --git a/csharp/src/Google.Protobuf.Test/Reflection/FeatureSetDescriptorTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/FeatureSetDescriptorTest.cs
index 625d15da66..a0bc6baa7a 100644
--- a/csharp/src/Google.Protobuf.Test/Reflection/FeatureSetDescriptorTest.cs
+++ b/csharp/src/Google.Protobuf.Test/Reflection/FeatureSetDescriptorTest.cs
@@ -56,7 +56,7 @@ public class FeatureSetDescriptorTest
         // a new edition. It should only be changed when you're sure that all the features in the new
         // edition are supported. Just changing the configuration for feature set default generation
         // will *advertise* that we support the new edition, but that isn't sufficient.
-        Edition maxSupportedEdition = Edition._2024;
+        Edition maxSupportedEdition = Edition._2026;
 
         // These lines should not need to be changed.
         FeatureSetDescriptor.GetEditionDefaults(maxSupportedEdition);
diff --git a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc
index 72ec5eaf7f..0ce162f005 100755
--- a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc
+++ b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.cc
@@ -204,7 +204,7 @@ const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fcsharp_2fc_5
     "p_features.proto\022\002pb\032 google/protobuf/de"
     "scriptor.proto\"S\n\016CSharpFeatures\022A\n\030null"
     "able_reference_types\030\001 \001(\010B\037\210\001\001\230\001\004\230\001\003\230\001\001"
-    "\242\001\n\022\005false\030\204\007\262\001\003\010\217N:@\n\006csharp\022\033.google.p"
+    "\242\001\n\022\005false\030\204\007\262\001\003\010\352\007:@\n\006csharp\022\033.google.p"
     "rotobuf.FeatureSet\030\354\007 \001(\0132\022.pb.CSharpFea"
     "turesB9B\030CSharpFeaturesOuterClassP\001\252\002\032Go"
     "ogle.Protobuf.Reflection"
diff --git a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h
index 8a2d11a016..8589967f5e 100755
--- a/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h
+++ b/src/google/protobuf/compiler/csharp/c_sharp_features.pb.h
@@ -60,7 +60,7 @@ namespace protobuf {
 namespace internal {
 template <>
 inline ::absl::string_view GetFeatureSetDefaultsData<::pb::CSharpFeatures>() {
-  static constexpr char kDefaults[] = "CiEYhAciA+I+ACoXCAEQAhgCIAMoATACOAJAAUgB4j4CCAAKIRjnByID4j4AKhcIAhABGAEgAigBMAE4AkABSAHiPgIIAAohGOgHIg8IARABGAEgAigBMAHiPgAqCzgCQAFIAeI+AggACiEY6QciEwgBEAEYASACKAEwATgBQALiPgAqB0gB4j4CCAAKIRjqByIVCAEQARgBIAIoATABOANAAkgC4j4AKgXiPgIIAAohGI9OIhcIARABGAEgAigBMAE4A0ACSALiPgIIACoD4j4AIOYHKOoH";
+  static constexpr char kDefaults[] = "CiEYhAciA+I+ACoXCAEQAhgCIAMoATACOAJAAUgB4j4CCAAKIRjnByID4j4AKhcIAhABGAEgAigBMAE4AkABSAHiPgIIAAohGOgHIg8IARABGAEgAigBMAHiPgAqCzgCQAFIAeI+AggACiEY6QciEwgBEAEYASACKAEwATgBQALiPgAqB0gB4j4CCAAKIRjqByIXCAEQARgBIAIoATABOANAAkgC4j4CCAAqA+I+ACDmByjqBw==";
   return kDefaults;
 }
 }  // namespace internal