diff --git a/builder/job.go b/builder/job.go
index 555232c9ae..ae501acb5d 100644
--- a/builder/job.go
+++ b/builder/job.go
@@ -124,7 +124,7 @@ func (b *BuilderJob) CmdBuild(job *engine.Job) engine.Status {
 	}
 
 	if repoName != "" {
-		b.Daemon.Repositories().Set(repoName, tag, id, false)
+		b.Daemon.Repositories().Set(repoName, tag, id, true)
 	}
 	return engine.StatusOK
 }
diff --git a/graph/tags.go b/graph/tags.go
index 31c65ced5c..6e4e63148a 100644
--- a/graph/tags.go
+++ b/graph/tags.go
@@ -218,11 +218,11 @@ func (store *TagStore) Set(repoName, tag, imageName string, force bool) error {
 	var repo Repository
 	if r, exists := store.Repositories[repoName]; exists {
 		repo = r
+		if old, exists := store.Repositories[repoName][tag]; exists && !force {
+			return fmt.Errorf("Conflict: Tag %s is already set to image %s, if you want to replace it, please use -f option", tag, old)
+		}
 	} else {
 		repo = make(map[string]string)
-		if old, exists := store.Repositories[repoName]; exists && !force {
-			return fmt.Errorf("Conflict: Tag %s:%s is already set to %s", repoName, tag, old)
-		}
 		store.Repositories[repoName] = repo
 	}
 	repo[tag] = img.ID
diff --git a/integration-cli/docker_cli_tag_test.go b/integration-cli/docker_cli_tag_test.go
index 71c643c349..bfab851115 100644
--- a/integration-cli/docker_cli_tag_test.go
+++ b/integration-cli/docker_cli_tag_test.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os/exec"
+	"strings"
 	"testing"
 )
 
@@ -92,3 +93,42 @@ func TestTagValidPrefixedRepo(t *testing.T) {
 		logDone(logMessage)
 	}
 }
+
+// tag an image with an existed tag name without -f option should fail
+func TestTagExistedNameWithoutForce(t *testing.T) {
+	if err := pullImageIfNotExist("busybox:latest"); err != nil {
+		t.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
+	}
+
+	tagCmd := exec.Command(dockerBinary, "tag", "busybox:latest", "busybox:test")
+	if out, _, err := runCommandWithOutput(tagCmd); err != nil {
+		t.Fatal(out, err)
+	}
+	tagCmd = exec.Command(dockerBinary, "tag", "busybox:latest", "busybox:test")
+	out, _, err := runCommandWithOutput(tagCmd)
+	if err == nil || !strings.Contains(out, "Conflict: Tag test is already set to image") {
+		t.Fatal("tag busybox busybox:test should have failed,because busybox:test is existed")
+	}
+	deleteImages("busybox:test")
+
+	logDone("tag - busybox with an existed tag name without -f option --> must fail")
+}
+
+// tag an image with an existed tag name with -f option should work
+func TestTagExistedNameWithForce(t *testing.T) {
+	if err := pullImageIfNotExist("busybox:latest"); err != nil {
+		t.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
+	}
+
+	tagCmd := exec.Command(dockerBinary, "tag", "busybox:latest", "busybox:test")
+	if out, _, err := runCommandWithOutput(tagCmd); err != nil {
+		t.Fatal(out, err)
+	}
+	tagCmd = exec.Command(dockerBinary, "tag", "-f", "busybox:latest", "busybox:test")
+	if out, _, err := runCommandWithOutput(tagCmd); err != nil {
+		t.Fatal(out, err)
+	}
+	deleteImages("busybox:test")
+
+	logDone("tag - busybox with an existed tag name with -f option work")
+}