diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ecb6f97e172..3bd35f9d781 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -2639,43 +2639,43 @@
 		},
 		{
 			"ImportPath": "k8s.io/gengo/args",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/import-boss/generators",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/set-gen/generators",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/set-gen/sets",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/generator",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/namer",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/parser",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/types",
-			"Rev": "cfac487ed0c8217f3b1ac5d33c14f78b35291151"
+			"Rev": "3c6a809462caf39389d70d9ea787ed24c5acffed"
 		},
 		{
 			"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
diff --git a/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go b/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
index 970ae2509f3..4206e2cae64 100644
--- a/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
+++ b/vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
@@ -226,8 +226,11 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 
 		var peerPkgs []string
 		if customArgs, ok := arguments.CustomArgs.(*CustomArgs); ok {
-			if len(customArgs.ExtraPeerDirs) > 0 {
-				peerPkgs = append(peerPkgs, customArgs.ExtraPeerDirs...)
+			for _, pkg := range customArgs.ExtraPeerDirs {
+				if i := strings.Index(pkg, "/vendor/"); i != -1 {
+					pkg = pkg[i+len("/vendor/"):]
+				}
+				peerPkgs = append(peerPkgs, pkg)
 			}
 		}
 		// Make sure our peer-packages are added and fully parsed.
diff --git a/vendor/k8s.io/gengo/parser/parse.go b/vendor/k8s.io/gengo/parser/parse.go
index c517fe1ead1..b4b7bb31eb5 100644
--- a/vendor/k8s.io/gengo/parser/parse.go
+++ b/vendor/k8s.io/gengo/parser/parse.go
@@ -171,6 +171,12 @@ func (b *Builder) AddFileForTest(pkg string, path string, src []byte) error {
 // flag indicates whether this file was user-requested or just from following
 // the import graph.
 func (b *Builder) addFile(pkgPath importPathString, path string, src []byte, userRequested bool) error {
+	for _, p := range b.parsed[pkgPath] {
+		if path == p.name {
+			glog.V(5).Infof("addFile %s %s already parsed, skipping", pkgPath, path)
+			return nil
+		}
+	}
 	glog.V(6).Infof("addFile %s %s", pkgPath, path)
 	p, err := parser.ParseFile(b.fset, path, src, parser.DeclarationErrors|parser.ParseComments)
 	if err != nil {