diff --git a/pkg/apis/clientauthentication/doc.go b/pkg/apis/clientauthentication/doc.go
index d06482d55..b99459757 100644
--- a/pkg/apis/clientauthentication/doc.go
+++ b/pkg/apis/clientauthentication/doc.go
@@ -16,4 +16,5 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package
 // +groupName=client.authentication.k8s.io
+
 package clientauthentication // import "k8s.io/client-go/pkg/apis/clientauthentication"
diff --git a/pkg/apis/clientauthentication/v1alpha1/doc.go b/pkg/apis/clientauthentication/v1alpha1/doc.go
index 016adb28a..19ab77614 100644
--- a/pkg/apis/clientauthentication/v1alpha1/doc.go
+++ b/pkg/apis/clientauthentication/v1alpha1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=client.authentication.k8s.io
+
 package v1alpha1 // import "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1"
diff --git a/pkg/apis/clientauthentication/v1beta1/doc.go b/pkg/apis/clientauthentication/v1beta1/doc.go
index fbcd9b7fe..22d1c588b 100644
--- a/pkg/apis/clientauthentication/v1beta1/doc.go
+++ b/pkg/apis/clientauthentication/v1beta1/doc.go
@@ -20,4 +20,5 @@ limitations under the License.
 // +k8s:defaulter-gen=TypeMeta
 
 // +groupName=client.authentication.k8s.io
+
 package v1beta1 // import "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1"
diff --git a/pkg/version/doc.go b/pkg/version/doc.go
index 30399fb02..05e997e13 100644
--- a/pkg/version/doc.go
+++ b/pkg/version/doc.go
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:openapi-gen=true
+
 // Package version supplies version information collected at build time to
 // kubernetes components.
-// +k8s:openapi-gen=true
 package version // import "k8s.io/client-go/pkg/version"
diff --git a/tools/clientcmd/api/doc.go b/tools/clientcmd/api/doc.go
index 0a081871a..5871575a6 100644
--- a/tools/clientcmd/api/doc.go
+++ b/tools/clientcmd/api/doc.go
@@ -15,4 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+
 package api
diff --git a/tools/clientcmd/api/v1/doc.go b/tools/clientcmd/api/v1/doc.go
index 9750cf73a..cbf29ccf2 100644
--- a/tools/clientcmd/api/v1/doc.go
+++ b/tools/clientcmd/api/v1/doc.go
@@ -15,4 +15,5 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+
 package v1