diff --git a/objectivec/GPBAny.pbobjc.h b/objectivec/GPBAny.pbobjc.h
index e30acc0..3f40181 100644
--- a/objectivec/GPBAny.pbobjc.h
+++ b/objectivec/GPBAny.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/any.proto
-
 // clang-format off
+// source: google/protobuf/any.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m
index e838675..7f62f11 100644
--- a/objectivec/GPBAny.pbobjc.m
+++ b/objectivec/GPBAny.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/any.proto
-
 // clang-format off
+// source: google/protobuf/any.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBAny.pbobjc.h"
@@ -101,4 +100,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBApi.pbobjc.h b/objectivec/GPBApi.pbobjc.h
index 3cd0821..11b5400 100644
--- a/objectivec/GPBApi.pbobjc.h
+++ b/objectivec/GPBApi.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/api.proto
-
 // clang-format off
+// source: google/protobuf/api.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m
index 88a215e..18c4c64 100644
--- a/objectivec/GPBApi.pbobjc.m
+++ b/objectivec/GPBApi.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/api.proto
-
 // clang-format off
+// source: google/protobuf/api.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBApi.pbobjc.h"
@@ -355,4 +354,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBDuration.pbobjc.h b/objectivec/GPBDuration.pbobjc.h
index fda9b47..7fb2658 100644
--- a/objectivec/GPBDuration.pbobjc.h
+++ b/objectivec/GPBDuration.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/duration.proto
-
 // clang-format off
+// source: google/protobuf/duration.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m
index bc61092..06f5bc3 100644
--- a/objectivec/GPBDuration.pbobjc.m
+++ b/objectivec/GPBDuration.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/duration.proto
-
 // clang-format off
+// source: google/protobuf/duration.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBDuration.pbobjc.h"
@@ -96,4 +95,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBEmpty.pbobjc.h b/objectivec/GPBEmpty.pbobjc.h
index 26ef9a6..1c840eb 100644
--- a/objectivec/GPBEmpty.pbobjc.h
+++ b/objectivec/GPBEmpty.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/empty.proto
-
 // clang-format off
+// source: google/protobuf/empty.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m
index 49f7030..2360c36 100644
--- a/objectivec/GPBEmpty.pbobjc.m
+++ b/objectivec/GPBEmpty.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/empty.proto
-
 // clang-format off
+// source: google/protobuf/empty.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBEmpty.pbobjc.h"
@@ -72,4 +71,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBFieldMask.pbobjc.h b/objectivec/GPBFieldMask.pbobjc.h
index 87898ad..5d4f59c 100644
--- a/objectivec/GPBFieldMask.pbobjc.h
+++ b/objectivec/GPBFieldMask.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/field_mask.proto
-
 // clang-format off
+// source: google/protobuf/field_mask.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m
index f820fd8..acb202d 100644
--- a/objectivec/GPBFieldMask.pbobjc.m
+++ b/objectivec/GPBFieldMask.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/field_mask.proto
-
 // clang-format off
+// source: google/protobuf/field_mask.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBFieldMask.pbobjc.h"
@@ -85,4 +84,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBSourceContext.pbobjc.h b/objectivec/GPBSourceContext.pbobjc.h
index e747dc0..8433882 100644
--- a/objectivec/GPBSourceContext.pbobjc.h
+++ b/objectivec/GPBSourceContext.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/source_context.proto
-
 // clang-format off
+// source: google/protobuf/source_context.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m
index 094f323..7f035e7 100644
--- a/objectivec/GPBSourceContext.pbobjc.m
+++ b/objectivec/GPBSourceContext.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/source_context.proto
-
 // clang-format off
+// source: google/protobuf/source_context.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBSourceContext.pbobjc.h"
@@ -85,4 +84,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBStruct.pbobjc.h b/objectivec/GPBStruct.pbobjc.h
index eaa531e..4035f51 100644
--- a/objectivec/GPBStruct.pbobjc.h
+++ b/objectivec/GPBStruct.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/struct.proto
-
 // clang-format off
+// source: google/protobuf/struct.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m
index 3707178..b6ee9c1 100644
--- a/objectivec/GPBStruct.pbobjc.m
+++ b/objectivec/GPBStruct.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/struct.proto
-
 // clang-format off
+// source: google/protobuf/struct.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBStruct.pbobjc.h"
@@ -298,4 +297,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBTimestamp.pbobjc.h b/objectivec/GPBTimestamp.pbobjc.h
index 6d6a930..0f1acdd 100644
--- a/objectivec/GPBTimestamp.pbobjc.h
+++ b/objectivec/GPBTimestamp.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/timestamp.proto
-
 // clang-format off
+// source: google/protobuf/timestamp.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m
index 1792ecb..7d2276c 100644
--- a/objectivec/GPBTimestamp.pbobjc.m
+++ b/objectivec/GPBTimestamp.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/timestamp.proto
-
 // clang-format off
+// source: google/protobuf/timestamp.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBTimestamp.pbobjc.h"
@@ -96,4 +95,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBType.pbobjc.h b/objectivec/GPBType.pbobjc.h
index ef9b74b..b102ab4 100644
--- a/objectivec/GPBType.pbobjc.h
+++ b/objectivec/GPBType.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/type.proto
-
 // clang-format off
+// source: google/protobuf/type.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m
index 5c8c73e..60f7c08 100644
--- a/objectivec/GPBType.pbobjc.m
+++ b/objectivec/GPBType.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/type.proto
-
 // clang-format off
+// source: google/protobuf/type.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBType.pbobjc.h"
@@ -710,4 +709,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/objectivec/GPBWrappers.pbobjc.h b/objectivec/GPBWrappers.pbobjc.h
index 11b052a..94e69ad 100644
--- a/objectivec/GPBWrappers.pbobjc.h
+++ b/objectivec/GPBWrappers.pbobjc.h
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/wrappers.proto
-
 // clang-format off
+// source: google/protobuf/wrappers.proto
 
 #import "GPBDescriptor.h"
 #import "GPBMessage.h"
diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m
index 45ee1a3..879579c 100644
--- a/objectivec/GPBWrappers.pbobjc.m
+++ b/objectivec/GPBWrappers.pbobjc.m
@@ -1,7 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/wrappers.proto
-
 // clang-format off
+// source: google/protobuf/wrappers.proto
 
 #import "GPBProtocolBuffers_RuntimeSupport.h"
 #import "GPBWrappers.pbobjc.h"
@@ -444,4 +443,4 @@
 
 // @@protoc_insertion_point(global_scope)
 
-// clange-format on
+// clang-format on
diff --git a/src/google/protobuf/compiler/objectivec/file.cc b/src/google/protobuf/compiler/objectivec/file.cc
index ff74517..bf175f9 100644
--- a/src/google/protobuf/compiler/objectivec/file.cc
+++ b/src/google/protobuf/compiler/objectivec/file.cc
@@ -644,7 +644,7 @@
     "\n"
     "// @@protoc_insertion_point(global_scope)\n"
     "\n"
-    "// clange-format on\n");
+    "// clang-format on\n");
 }
 
 // Helper to print the import of the runtime support at the top of generated
@@ -655,9 +655,8 @@
     const std::vector<std::string>& headers_to_import) const {
   printer->Print(
       "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// source: $filename$\n"
-      "\n"
       "// clang-format off\n"
+      "// source: $filename$\n"
       "\n",
       "filename", file_->name());