diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8ebe63108..4f13dcba9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -928,143 +928,143 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admission/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/auditregistration/v1alpha1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta2",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/coordination/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/coordination/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "58073247e1e0ac17341c173df242a45b63b88e36"
+			"Rev": "70d835a3539e708849fc308751fba0c3159420b0"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
diff --git a/pkg/apis/audit/v1/doc.go b/pkg/apis/audit/v1/doc.go
index b8f818ffd..d1f180c94 100644
--- a/pkg/apis/audit/v1/doc.go
+++ b/pkg/apis/audit/v1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/audit
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
diff --git a/pkg/apis/audit/v1alpha1/doc.go b/pkg/apis/audit/v1alpha1/doc.go
index d2cbdd991..54a8440eb 100644
--- a/pkg/apis/audit/v1alpha1/doc.go
+++ b/pkg/apis/audit/v1alpha1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/audit
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
diff --git a/pkg/apis/audit/v1beta1/doc.go b/pkg/apis/audit/v1beta1/doc.go
index d43a807c3..f3fe61683 100644
--- a/pkg/apis/audit/v1beta1/doc.go
+++ b/pkg/apis/audit/v1beta1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/audit
 // +k8s:openapi-gen=true
 // +k8s:defaulter-gen=TypeMeta
diff --git a/pkg/apis/example/v1/doc.go b/pkg/apis/example/v1/doc.go
index 33a3ef04b..ab15774a3 100644
--- a/pkg/apis/example/v1/doc.go
+++ b/pkg/apis/example/v1/doc.go
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 // +k8s:deepcopy-gen=package
+// +k8s:protobuf-gen=package
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/example
 // +k8s:openapi-gen=false
 // +k8s:defaulter-gen=TypeMeta