diff --git a/daemon/daemon.go b/daemon/daemon.go
index cc20954d61..e4304b2a48 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -114,6 +114,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
 	if err := eng.Register("pause", daemon.ContainerPause); err != nil {
 		return err
 	}
+	if err := eng.Register("unpause", daemon.ContainerUnpause); err != nil {
+		return err
+	}
 	return nil
 }
 
diff --git a/daemon/pause.go b/daemon/pause.go
index 57f492e293..72e5cee020 100644
--- a/daemon/pause.go
+++ b/daemon/pause.go
@@ -19,3 +19,19 @@ func (daemon *Daemon) ContainerPause(job *engine.Job) engine.Status {
 	job.Eng.Job("log", "pause", container.ID, daemon.Repositories().ImageName(container.Image)).Run()
 	return engine.StatusOK
 }
+
+func (daemon *Daemon) ContainerUnpause(job *engine.Job) engine.Status {
+	if n := len(job.Args); n < 1 || n > 2 {
+		return job.Errorf("Usage: %s CONTAINER", job.Name)
+	}
+	name := job.Args[0]
+	container := daemon.Get(name)
+	if container == nil {
+		return job.Errorf("No such container: %s", name)
+	}
+	if err := container.Unpause(); err != nil {
+		return job.Errorf("Cannot unpause container %s: %s", name, err)
+	}
+	job.Eng.Job("log", "unpause", container.ID, daemon.Repositories().ImageName(container.Image)).Run()
+	return engine.StatusOK
+}
diff --git a/server/container.go b/server/container.go
index 073d68d7ce..b37fa521f5 100644
--- a/server/container.go
+++ b/server/container.go
@@ -31,22 +31,6 @@ import (
 	"github.com/docker/docker/utils"
 )
 
-func (srv *Server) ContainerUnpause(job *engine.Job) engine.Status {
-	if n := len(job.Args); n < 1 || n > 2 {
-		return job.Errorf("Usage: %s CONTAINER", job.Name)
-	}
-	name := job.Args[0]
-	container := srv.daemon.Get(name)
-	if container == nil {
-		return job.Errorf("No such container: %s", name)
-	}
-	if err := container.Unpause(); err != nil {
-		return job.Errorf("Cannot unpause container %s: %s", name, err)
-	}
-	srv.LogEvent("unpause", container.ID, srv.daemon.Repositories().ImageName(container.Image))
-	return engine.StatusOK
-}
-
 // ContainerKill send signal to the container
 // If no signal is given (sig 0), then Kill with SIGKILL and wait
 // for the container to exit.
diff --git a/server/init.go b/server/init.go
index 189b9e52f7..9b6033b6c0 100644
--- a/server/init.go
+++ b/server/init.go
@@ -92,7 +92,6 @@ func InitServer(job *engine.Job) engine.Status {
 		"restart":          srv.ContainerRestart,
 		"start":            srv.ContainerStart,
 		"kill":             srv.ContainerKill,
-		"unpause":          srv.ContainerUnpause,
 		"wait":             srv.ContainerWait,
 		"tag":              srv.ImageTag, // FIXME merge with "image_tag"
 		"resize":           srv.ContainerResize,