diff --git a/proto/dependencies.sh b/proto/dependencies.sh
index 1d9d8b3..84802a2 100755
--- a/proto/dependencies.sh
+++ b/proto/dependencies.sh
@@ -24,6 +24,35 @@ mkdir -p k8s.io/apimachinery/pkg/util/intstr
 mkdir -p k8s.io/apimachinery/pkg/runtime/schema
 mkdir -p k8s.io/apis/meta/v1
 
+mkdir -p k8s.io/api/rbac/v1alpha1
+mkdir -p k8s.io/api/rbac/v1
+mkdir -p k8s.io/api/rbac/v1beta1
+mkdir -p k8s.io/api/networking/v1
+mkdir -p k8s.io/api/settings/v1alpha1
+mkdir -p k8s.io/api/admissionregistration/v1alpha1
+mkdir -p k8s.io/api/scheduling/v1alpha1
+mkdir -p k8s.io/api/storage/v1
+mkdir -p k8s.io/api/storage/v1beta1
+mkdir -p k8s.io/api/batch/v2alpha1
+mkdir -p k8s.io/api/batch/v1
+mkdir -p k8s.io/api/batch/v1beta1
+mkdir -p k8s.io/api/apps/v1beta2
+mkdir -p k8s.io/api/apps/v1
+mkdir -p k8s.io/api/apps/v1beta1
+mkdir -p k8s.io/api/authentication/v1
+mkdir -p k8s.io/api/authentication/v1beta1
+mkdir -p k8s.io/api/admission/v1alpha1
+mkdir -p k8s.io/api/policy/v1beta1
+mkdir -p k8s.io/api/core/v1
+mkdir -p k8s.io/api/autoscaling/v1
+mkdir -p k8s.io/api/autoscaling/v2beta1
+mkdir -p k8s.io/api/extensions/v1beta1
+mkdir -p k8s.io/api/certificates/v1beta1
+mkdir -p k8s.io/api/imagepolicy/v1alpha1
+mkdir -p k8s.io/api/authorization/v1
+mkdir -p k8s.io/api/authorization/v1beta1
+mkdir -p k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1
+
 base=https://raw.githubusercontent.com/kubernetes
 machinery_base=${base}/apimachinery/${release}
 curl -s ${machinery_base}/pkg/api/resource/generated.proto \
@@ -38,8 +67,35 @@ curl -s ${machinery_base}/pkg/util/intstr/generated.proto \
 curl -s ${machinery_base}/pkg/runtime/generated.proto \
 	> k8s.io/apimachinery/pkg/runtime/generated.proto
 
-curl -s ${machinery_base}/runtime/schema/generated.proto \
+curl -s ${machinery_base}/pkg/runtime/schema/generated.proto \
 	> k8s.io/apimachinery/pkg/runtime/schema/generated.proto
 
-# There are currently no release branches for this file.
-curl -s ${base}/api/master/core/v1/generated.proto > v1.proto
+# There are currently no release branches for these files.
+curl -s ${base}/api/master/rbac/v1alpha1/generated.proto > k8s.io/api/rbac/v1alpha1/generated.proto
+curl -s ${base}/api/master/rbac/v1/generated.proto > k8s.io/api/rbac/v1/generated.proto
+curl -s ${base}/api/master/rbac/v1beta1/generated.proto > k8s.io/api/rbac/v1beta1/generated.proto
+curl -s ${base}/api/master/networking/v1/generated.proto > k8s.io/api/networking/v1/generated.proto
+curl -s ${base}/api/master/settings/v1alpha1/generated.proto > k8s.io/api/settings/v1alpha1/generated.proto
+curl -s ${base}/api/master/admissionregistration/v1alpha1/generated.proto > k8s.io/api/admissionregistration/v1alpha1/generated.proto
+curl -s ${base}/api/master/scheduling/v1alpha1/generated.proto > k8s.io/api/scheduling/v1alpha1/generated.proto
+curl -s ${base}/api/master/storage/v1/generated.proto > k8s.io/api/storage/v1/generated.proto
+curl -s ${base}/api/master/storage/v1beta1/generated.proto > k8s.io/api/storage/v1beta1/generated.proto
+curl -s ${base}/api/master/batch/v2alpha1/generated.proto > k8s.io/api/batch/v2alpha1/generated.proto
+curl -s ${base}/api/master/batch/v1/generated.proto > k8s.io/api/batch/v1/generated.proto
+curl -s ${base}/api/master/batch/v1beta1/generated.proto > k8s.io/api/batch/v1beta1/generated.proto
+curl -s ${base}/api/master/apps/v1beta2/generated.proto > k8s.io/api/apps/v1beta2/generated.proto
+curl -s ${base}/api/master/apps/v1/generated.proto > k8s.io/api/apps/v1/generated.proto
+curl -s ${base}/api/master/apps/v1beta1/generated.proto > k8s.io/api/apps/v1beta1/generated.proto
+curl -s ${base}/api/master/authentication/v1/generated.proto > k8s.io/api/authentication/v1/generated.proto
+curl -s ${base}/api/master/authentication/v1beta1/generated.proto > k8s.io/api/authentication/v1beta1/generated.proto
+curl -s ${base}/api/master/admission/v1alpha1/generated.proto > k8s.io/api/admission/v1alpha1/generated.proto
+curl -s ${base}/api/master/policy/v1beta1/generated.proto > k8s.io/api/policy/v1beta1/generated.proto
+curl -s ${base}/api/master/core/v1/generated.proto > k8s.io/api/core/v1/generated.proto
+curl -s ${base}/api/master/autoscaling/v1/generated.proto > k8s.io/api/autoscaling/v1/generated.proto
+curl -s ${base}/api/master/autoscaling/v2beta1/generated.proto > k8s.io/api/autoscaling/v2beta1/generated.proto
+curl -s ${base}/api/master/extensions/v1beta1/generated.proto > k8s.io/api/extensions/v1beta1/generated.proto
+curl -s ${base}/api/master/certificates/v1beta1/generated.proto > k8s.io/api/certificates/v1beta1/generated.proto
+curl -s ${base}/api/master/imagepolicy/v1alpha1/generated.proto > k8s.io/api/imagepolicy/v1alpha1/generated.proto
+curl -s ${base}/api/master/authorization/v1/generated.proto > k8s.io/api/authorization/v1/generated.proto
+curl -s ${base}/api/master/authorization/v1beta1/generated.proto > k8s.io/api/authorization/v1beta1/generated.proto
+curl -s ${base}/apiextensions-apiserver/master/pkg/apis/apiextensions/v1beta1/generated.proto > k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto
diff --git a/proto/generate.sh b/proto/generate.sh
index 9a9b1fe..771367f 100755
--- a/proto/generate.sh
+++ b/proto/generate.sh
@@ -30,12 +30,39 @@ fi
 ${dir}/dependencies.sh
 
 # The format here is <file-name>;<generated-class-name>
-files="v1.proto;V1 \
-       k8s.io/apimachinery/pkg/api/resource/generated.proto;Resource \
+files="k8s.io/apimachinery/pkg/api/resource/generated.proto;Resource \
        k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto;Meta \
        k8s.io/apimachinery/pkg/runtime/generated.proto;Runtime \
        k8s.io/apimachinery/pkg/runtime/schema/generated.proto;RuntimeSchema \
-       k8s.io/apimachinery/pkg/util/intstr/generated.proto;IntStr"
+       k8s.io/apimachinery/pkg/util/intstr/generated.proto;IntStr \
+       k8s.io/api/rbac/v1alpha1/generated.proto;V1alpha1Rbac \
+       k8s.io/api/rbac/v1/generated.proto;V1Rbac \
+       k8s.io/api/rbac/v1beta1/generated.proto;V1beta1Rbac \
+       k8s.io/api/networking/v1/generated.proto;V1Networking \
+       k8s.io/api/settings/v1alpha1/generated.proto;V1alpha1Settings \
+       k8s.io/api/admissionregistration/v1alpha1/generated.proto;V1alpha1Admissionregistration \
+       k8s.io/api/scheduling/v1alpha1/generated.proto;V1alpha1Scheduling \
+       k8s.io/api/storage/v1/generated.proto;V1Storage \
+       k8s.io/api/storage/v1beta1/generated.proto;V1beta1Storage \
+       k8s.io/api/batch/v2alpha1/generated.proto;V2alpha1Batch \
+       k8s.io/api/batch/v1/generated.proto;V1Batch \
+       k8s.io/api/batch/v1beta1/generated.proto;V1beta1Batch \
+       k8s.io/api/apps/v1beta2/generated.proto;V1beta2Apps \
+       k8s.io/api/apps/v1/generated.proto;V1Apps \
+       k8s.io/api/apps/v1beta1/generated.proto;V1beta1Apps \
+       k8s.io/api/authentication/v1/generated.proto;V1Authentication \
+       k8s.io/api/authentication/v1beta1/generated.proto;V1beta1Authentication \
+       k8s.io/api/admission/v1alpha1/generated.proto;V1alpha1Admission \
+       k8s.io/api/policy/v1beta1/generated.proto;V1beta1Policy \
+       k8s.io/api/core/v1/generated.proto;V1 \
+       k8s.io/api/autoscaling/v1/generated.proto;V1Autoscaling \
+       k8s.io/api/autoscaling/v2beta1/generated.proto;V2beta1Autoscaling \
+       k8s.io/api/extensions/v1beta1/generated.proto;V1beta1Extensions \
+       k8s.io/api/certificates/v1beta1/generated.proto;V1beta1Certificates \
+       k8s.io/api/imagepolicy/v1alpha1/generated.proto;V1alpha1Imagepolicy \
+       k8s.io/api/authorization/v1/generated.proto;V1Authorization \
+       k8s.io/api/authorization/v1beta1/generated.proto;V1beta1Authorization \
+       k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto;V1beta1Apiextensions"
 
 proto_files=""