diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b1ad77b1c1d..32c226f6c00 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -2586,43 +2586,43 @@
 		},
 		{
 			"ImportPath": "k8s.io/gengo/args",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/deepcopy-gen/generators",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/defaulter-gen/generators",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/import-boss/generators",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/set-gen/generators",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/examples/set-gen/sets",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/generator",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/namer",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/parser",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/gengo/types",
-			"Rev": "4a9ebbace691333e73f9978d798b1bad6c53a50d"
+			"Rev": "6a1c24d7f08e671c244023ca9367d2dfbfaf57fc"
 		},
 		{
 			"ImportPath": "k8s.io/heapster/metrics/api/v1/types",
diff --git a/vendor/k8s.io/gengo/parser/parse.go b/vendor/k8s.io/gengo/parser/parse.go
index daf6e6c5b2f..58c9c7d65e2 100644
--- a/vendor/k8s.io/gengo/parser/parse.go
+++ b/vendor/k8s.io/gengo/parser/parse.go
@@ -453,6 +453,7 @@ func (b *Builder) findTypesIn(pkgPath string, u *types.Universe) error {
 		if ok {
 			t := b.walkType(*u, nil, tn.Type())
 			c1 := b.priorCommentLines(obj.Pos(), 1)
+			// c1.Text() is safe if c1 is nil
 			t.CommentLines = splitLines(c1.Text())
 			if c1 == nil {
 				t.SecondClosestCommentLines = splitLines(b.priorCommentLines(obj.Pos(), 2).Text())
@@ -463,7 +464,15 @@ func (b *Builder) findTypesIn(pkgPath string, u *types.Universe) error {
 		tf, ok := obj.(*tc.Func)
 		// We only care about functions, not concrete/abstract methods.
 		if ok && tf.Type() != nil && tf.Type().(*tc.Signature).Recv() == nil {
-			b.addFunction(*u, nil, tf)
+			t := b.addFunction(*u, nil, tf)
+			c1 := b.priorCommentLines(obj.Pos(), 1)
+			// c1.Text() is safe if c1 is nil
+			t.CommentLines = splitLines(c1.Text())
+			if c1 == nil {
+				t.SecondClosestCommentLines = splitLines(b.priorCommentLines(obj.Pos(), 2).Text())
+			} else {
+				t.SecondClosestCommentLines = splitLines(b.priorCommentLines(c1.List[0].Slash, 2).Text())
+			}
 		}
 		tv, ok := obj.(*tc.Var)
 		if ok && !tv.IsField() {