diff --git a/api.go b/api.go
index cd6697dcd0..d5396a5851 100644
--- a/api.go
+++ b/api.go
@@ -567,8 +567,8 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {
 			"/commit":                       postCommit,
 			"/build":                        postBuild,
 			"/images/create":                postImagesCreate,
-			"/images/{name:*.}/insert":      postImagesInsert,
-			"/images/{name:*.}/push":        postImagesPush,
+			"/images/{name:.*}/insert":      postImagesInsert,
+			"/images/{name:.*}/push":        postImagesPush,
 			"/images/{name:.*}/tag":         postImagesTag,
 			"/containers/create":            postContainersCreate,
 			"/containers/{name:.*}/kill":    postContainersKill,
diff --git a/commands.go b/commands.go
index 71b1df7904..5894cb0d2c 100644
--- a/commands.go
+++ b/commands.go
@@ -588,7 +588,7 @@ func CmdImport(args ...string) error {
 	v.Set("tag", tag)
 	v.Set("fromSrc", src)
 
-	err := hijack("POST", "/images?"+v.Encode(), false)
+	err := hijack("POST", "/images/create?"+v.Encode(), false)
 	if err != nil {
 		return err
 	}
@@ -645,8 +645,7 @@ func CmdPush(args ...string) error {
 
 	v := url.Values{}
 	v.Set("registry", *registry)
-
-	if err := hijack("POST", "/images"+name+"/push?"+v.Encode(), false); err != nil {
+	if err := hijack("POST", "/images/"+name+"/push?"+v.Encode(), false); err != nil {
 		return err
 	}
 	return nil
@@ -677,7 +676,7 @@ func CmdPull(args ...string) error {
 	v.Set("tag", *tag)
 	v.Set("registry", *registry)
 
-	if err := hijack("POST", "/images?"+v.Encode(), false); err != nil {
+	if err := hijack("POST", "/images/create?"+v.Encode(), false); err != nil {
 		return err
 	}
 
@@ -716,7 +715,7 @@ func CmdImages(args ...string) error {
 			v.Set("all", "1")
 		}
 
-		body, _, err := call("GET", "/images?"+v.Encode(), nil)
+		body, _, err := call("GET", "/images/json?"+v.Encode(), nil)
 		if err != nil {
 			return err
 		}
@@ -1244,12 +1243,12 @@ func hijack(method, path string, setRawTerminal bool) error {
 	if err := <-receiveStdout; err != nil {
 		return err
 	}
+
 	if !term.IsTerminal(int(os.Stdin.Fd())) {
 		if err := <-sendStdin; err != nil {
 			return err
 		}
 	}
-
 	return nil
 
 }