diff --git a/components/engine/api/server/router/swarm/cluster_routes.go b/components/engine/api/server/router/swarm/cluster_routes.go
index 3c98e3ee26..0e3cae39cd 100644
--- a/components/engine/api/server/router/swarm/cluster_routes.go
+++ b/components/engine/api/server/router/swarm/cluster_routes.go
@@ -327,7 +327,7 @@ func (sr *swarmRouter) updateSecret(ctx context.Context, w http.ResponseWriter,
 
 	id := vars["id"]
 	if err := sr.backend.UpdateSecret(id, version, secret); err != nil {
-		return errors.NewErrorWithStatusCode(err, http.StatusInternalServerError)
+		return err
 	}
 
 	return nil
diff --git a/components/engine/api/types/swarm/secret.go b/components/engine/api/types/swarm/secret.go
index 72e93c9d26..dbed63af8e 100644
--- a/components/engine/api/types/swarm/secret.go
+++ b/components/engine/api/types/swarm/secret.go
@@ -14,7 +14,7 @@ type Secret struct {
 // SecretSpec represents a secret specification from a secret in swarm
 type SecretSpec struct {
 	Annotations
-	Data []byte
+	Data []byte `json:",omitempty"`
 }
 
 // SecretReferenceFileTarget is a file target in a secret reference
diff --git a/components/engine/cli/command/service/opts.go b/components/engine/cli/command/service/opts.go
index 45adb37672..b81998ec09 100644
--- a/components/engine/cli/command/service/opts.go
+++ b/components/engine/cli/command/service/opts.go
@@ -585,7 +585,6 @@ func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) {
 	flags.BoolVar(&opts.healthcheck.noHealthcheck, flagNoHealthcheck, false, "Disable any container-specified HEALTHCHECK")
 
 	flags.BoolVarP(&opts.tty, flagTTY, "t", false, "Allocate a pseudo-TTY")
-	flags.StringSliceVar(&opts.secrets, flagSecret, []string{}, "Specify secrets to expose to the service")
 }
 
 const (
diff --git a/components/engine/cli/command/service/opts_test.go b/components/engine/cli/command/service/opts_test.go
index 85de3ae88a..aa2d999dcf 100644
--- a/components/engine/cli/command/service/opts_test.go
+++ b/components/engine/cli/command/service/opts_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/testutil/assert"
 )
 
diff --git a/components/engine/daemon/container_operations_unix.go b/components/engine/daemon/container_operations_unix.go
index a89ef3056b..8fbc7bca6f 100644
--- a/components/engine/daemon/container_operations_unix.go
+++ b/components/engine/daemon/container_operations_unix.go
@@ -18,9 +18,9 @@ import (
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/links"
 	"github.com/docker/docker/pkg/idtools"
+	"github.com/docker/docker/pkg/mount"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/runconfig"
-	"github.com/docker/engine-api/types/mount"
 	"github.com/docker/libnetwork"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"github.com/opencontainers/runc/libcontainer/devices"