@@ -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

 }

@@ -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