diff --git a/src/google/protobuf/compiler/java/java_message.cc b/src/google/protobuf/compiler/java/java_message.cc
index 1f8e209cc5..a326057176 100644
--- a/src/google/protobuf/compiler/java/java_message.cc
+++ b/src/google/protobuf/compiler/java/java_message.cc
@@ -645,6 +645,11 @@ void MessageGenerator::GenerateBuilder(io::Printer* printer) {
                      .GenerateBuilderMembers(printer);
   }
 
+  printer->Print(
+    "\n"
+    "// @@protoc_insertion_point(builder_scope:$full_name$)\n",
+    "full_name", descriptor_->full_name());
+
   printer->Outdent();
   printer->Print("}\n");
 }
diff --git a/src/google/protobuf/compiler/java/java_plugin_unittest.cc b/src/google/protobuf/compiler/java/java_plugin_unittest.cc
index f197062627..cfe01885ff 100644
--- a/src/google/protobuf/compiler/java/java_plugin_unittest.cc
+++ b/src/google/protobuf/compiler/java/java_plugin_unittest.cc
@@ -61,6 +61,8 @@ class TestGenerator : public CodeGenerator {
     TryInsert("Test.java", "outer_class_scope", output_directory);
     TryInsert("Test.java", "class_scope:foo.Bar", output_directory);
     TryInsert("Test.java", "class_scope:foo.Bar.Baz", output_directory);
+    TryInsert("Test.java", "builder_scope:foo.Bar", output_directory);
+    TryInsert("Test.java", "builder_scope:foo.Bar.Baz", output_directory);
     TryInsert("Test.java", "enum_scope:foo.Qux", output_directory);
     return true;
   }