diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach.go
index 6dcd579ccc9..611cc0b6565 100644
--- a/pkg/kubectl/cmd/attach.go
+++ b/pkg/kubectl/cmd/attach.go
@@ -202,8 +202,14 @@ func (p *AttachOptions) Run() error {
 		Resource("pods").
 		Name(pod.Name).
 		Namespace(pod.Namespace).
-		SubResource("attach").
-		Param("container", p.GetContainerName(pod))
+		SubResource("attach")
+	req.VersionedParams(&api.PodAttachOptions{
+		Container: p.GetContainerName(pod),
+		Stdin:     stdin != nil,
+		Stdout:    p.Out != nil,
+		Stderr:    p.Err != nil,
+		TTY:       tty,
+	}, api.Scheme)
 
 	return p.Attach.Attach("POST", req.URL(), p.Config, stdin, p.Out, p.Err, tty)
 }
diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach_test.go
index acf44470fd9..c508fcf27c6 100644
--- a/pkg/kubectl/cmd/attach_test.go
+++ b/pkg/kubectl/cmd/attach_test.go
@@ -186,6 +186,9 @@ func TestAttach(t *testing.T) {
 		if ex.method != "POST" {
 			t.Errorf("%s: Did not get method for attach request: %s", test.name, ex.method)
 		}
+		if ex.url.Query().Get("container") != "bar" {
+			t.Errorf("%s: Did not have query parameters: %s", test.name, ex.url.Query())
+		}
 	}
 }