diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go
index d79b100e8a..2c70352e0b 100644
--- a/pkg/api/handlers/compat/images_build.go
+++ b/pkg/api/handlers/compat/images_build.go
@@ -395,6 +395,13 @@ loop:
 						logrus.Warnf("Failed to json encode error %v", err)
 					}
 					flush()
+					for _, tag := range query.Tag {
+						m.Stream = fmt.Sprintf("Successfully tagged %s\n", tag)
+						if err := enc.Encode(m); err != nil {
+							logrus.Warnf("Failed to json encode error %v", err)
+						}
+						flush()
+					}
 				}
 			}
 			break loop
diff --git a/pkg/api/server/register_images.go b/pkg/api/server/register_images.go
index f6a8a37ca4..3d86e5d388 100644
--- a/pkg/api/server/register_images.go
+++ b/pkg/api/server/register_images.go
@@ -652,6 +652,7 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
 	//           example: |
 	//             (build details...)
 	//             Successfully built 8ba084515c724cbf90d447a63600c0a6
+	//             Successfully tagged your_image:latest
 	//   400:
 	//     $ref: "#/responses/BadParamError"
 	//   500:
@@ -1485,7 +1486,6 @@ func (s *APIServer) registerImagesHandlers(r *mux.Router) error {
 	//           description: output from build process
 	//           example: |
 	//             (build details...)
-	//             Successfully built 8ba084515c724cbf90d447a63600c0a6
 	//   400:
 	//     $ref: "#/responses/BadParamError"
 	//   500: