diff --git a/docker/docker.go b/docker/docker.go
index 2aa10dbe54..b783c6da02 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -10,8 +10,8 @@ import (
 	"github.com/dotcloud/docker/builtins"
 	"github.com/dotcloud/docker/dockerversion"
 	"github.com/dotcloud/docker/engine"
+	"github.com/dotcloud/docker/opts"
 	flag "github.com/dotcloud/docker/pkg/mflag"
-	"github.com/dotcloud/docker/pkg/opts"
 	"github.com/dotcloud/docker/sysinit"
 	"github.com/dotcloud/docker/utils"
 )
diff --git a/pkg/opts/opts.go b/opts/opts.go
similarity index 100%
rename from pkg/opts/opts.go
rename to opts/opts.go
diff --git a/pkg/opts/opts_test.go b/opts/opts_test.go
similarity index 100%
rename from pkg/opts/opts_test.go
rename to opts/opts_test.go
diff --git a/runconfig/parse.go b/runconfig/parse.go
index fb08c068b2..d481da8d3b 100644
--- a/runconfig/parse.go
+++ b/runconfig/parse.go
@@ -3,8 +3,8 @@ package runconfig
 import (
 	"fmt"
 	"github.com/dotcloud/docker/nat"
+	"github.com/dotcloud/docker/opts"
 	flag "github.com/dotcloud/docker/pkg/mflag"
-	"github.com/dotcloud/docker/pkg/opts"
 	"github.com/dotcloud/docker/pkg/sysinfo"
 	"github.com/dotcloud/docker/utils"
 	"io/ioutil"