diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go
index 90e2ab5cf1..baa49d2afb 100644
--- a/cmd/podman/commands.go
+++ b/cmd/podman/commands.go
@@ -10,7 +10,6 @@ import (
 func getMainCommands() []*cobra.Command {
 	rootCommands := []*cobra.Command{
 		_attachCommand,
-		_buildCommand,
 		_commitCommand,
 		_createCommand,
 		_diffCommand,
@@ -54,7 +53,6 @@ func getMainCommands() []*cobra.Command {
 // Commands that the local client implements
 func getImageSubCommands() []*cobra.Command {
 	return []*cobra.Command{
-		_buildCommand,
 		_loadCommand,
 		_saveCommand,
 		_signCommand,
diff --git a/cmd/podman/image.go b/cmd/podman/image.go
index edc37b28a0..4f9c7cd6ac 100644
--- a/cmd/podman/image.go
+++ b/cmd/podman/image.go
@@ -18,6 +18,7 @@ var (
 
 //imageSubCommands are implemented both in local and remote clients
 var imageSubCommands = []*cobra.Command{
+	_buildCommand,
 	_historyCommand,
 	_imageExistsCommand,
 	_imagesCommand,
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index a6f0c500ae..f9820c0755 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -30,6 +30,7 @@ var (
 // Commands that the remote and local client have
 // implemented.
 var mainCommands = []*cobra.Command{
+	_buildCommand,
 	_exportCommand,
 	_historyCommand,
 	_imagesCommand,