diff --git a/command/commands/commands.go b/command/commands/commands.go
index 95615fe0b5..cace1b152c 100644
--- a/command/commands/commands.go
+++ b/command/commands/commands.go
@@ -33,6 +33,7 @@ func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
 		system.NewEventsCommand(dockerCli),
 		registry.NewLoginCommand(dockerCli),
 		registry.NewLogoutCommand(dockerCli),
+		registry.NewSearchCommand(dockerCli),
 		system.NewVersionCommand(dockerCli),
 		volume.NewVolumeCommand(dockerCli),
 		system.NewInfoCommand(dockerCli),
@@ -66,7 +67,6 @@ func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
 		hide(image.NewPushCommand(dockerCli)),
 		hide(image.NewRemoveCommand(dockerCli)),
 		hide(image.NewSaveCommand(dockerCli)),
-		hide(image.NewSearchCommand(dockerCli)),
 		hide(image.NewTagCommand(dockerCli)),
 		hide(system.NewInspectCommand(dockerCli)),
 	)
diff --git a/command/image/cmd.go b/command/image/cmd.go
index e04c4c23f3..4a7d2b3fd9 100644
--- a/command/image/cmd.go
+++ b/command/image/cmd.go
@@ -27,7 +27,6 @@ func NewImageCommand(dockerCli *command.DockerCli) *cobra.Command {
 		NewPullCommand(dockerCli),
 		NewPushCommand(dockerCli),
 		NewSaveCommand(dockerCli),
-		NewSearchCommand(dockerCli),
 		NewTagCommand(dockerCli),
 		newListCommand(dockerCli),
 		newRemoveCommand(dockerCli),
diff --git a/command/image/search.go b/command/registry/search.go
similarity index 99%
rename from command/image/search.go
rename to command/registry/search.go
index 93db7006ac..124b4ae6cc 100644
--- a/command/image/search.go
+++ b/command/registry/search.go
@@ -1,4 +1,4 @@
-package image
+package registry
 
 import (
 	"fmt"