diff --git a/api/client/port.go b/api/client/port.go
index a9483e4491..2b3052abbd 100644
--- a/api/client/port.go
+++ b/api/client/port.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/docker/nat"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/docker/pkg/nat"
 )
 
 // CmdPort lists port mappings for a container.
diff --git a/builder/dispatchers.go b/builder/dispatchers.go
index 63d02cc4a9..439f956813 100644
--- a/builder/dispatchers.go
+++ b/builder/dispatchers.go
@@ -18,8 +18,8 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/nat"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/runconfig"
 )
 
diff --git a/daemon/container.go b/daemon/container.go
index 8dd75a416a..f922a43f1b 100644
--- a/daemon/container.go
+++ b/daemon/container.go
@@ -21,12 +21,12 @@ import (
 	"github.com/docker/docker/daemon/logger/jsonfilelog"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/broadcastwriter"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/jsonlog"
 	"github.com/docker/docker/pkg/mount"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/promise"
 	"github.com/docker/docker/pkg/symlink"
 	"github.com/docker/docker/runconfig"
diff --git a/daemon/container_linux.go b/daemon/container_linux.go
index 77010220c9..e3cd9fc829 100644
--- a/daemon/container_linux.go
+++ b/daemon/container_linux.go
@@ -18,10 +18,10 @@ import (
 	"github.com/docker/docker/daemon/execdriver"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/links"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/directory"
 	"github.com/docker/docker/pkg/ioutils"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/pkg/ulimit"
 	"github.com/docker/docker/runconfig"
diff --git a/daemon/container_unit_test.go b/daemon/container_unit_test.go
index 9599675f79..642cad8f1c 100644
--- a/daemon/container_unit_test.go
+++ b/daemon/container_unit_test.go
@@ -1,7 +1,7 @@
 package daemon
 
 import (
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"testing"
 )
 
diff --git a/daemon/list.go b/daemon/list.go
index 2b38b1ed96..5891e947d4 100644
--- a/daemon/list.go
+++ b/daemon/list.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/pkg/graphdb"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/parsers/filters"
 )
 
diff --git a/daemon/network/settings.go b/daemon/network/settings.go
index ca60ff1980..41ae2a17de 100644
--- a/daemon/network/settings.go
+++ b/daemon/network/settings.go
@@ -1,6 +1,6 @@
 package network
 
-import "github.com/docker/docker/nat"
+import "github.com/docker/docker/pkg/nat"
 
 type Address struct {
 	Addr      string
diff --git a/integration-cli/docker_cli_create_test.go b/integration-cli/docker_cli_create_test.go
index 23c9ae165b..9aeca43454 100644
--- a/integration-cli/docker_cli_create_test.go
+++ b/integration-cli/docker_cli_create_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/go-check/check"
 )
 
diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go
index 2c5d65b6af..97b8658e21 100644
--- a/integration-cli/docker_cli_run_test.go
+++ b/integration-cli/docker_cli_run_test.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/libnetwork/resolvconf"
 	"github.com/go-check/check"
 )
diff --git a/links/links.go b/links/links.go
index a756c8b0e5..d8e9730eed 100644
--- a/links/links.go
+++ b/links/links.go
@@ -5,7 +5,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 type Link struct {
diff --git a/links/links_test.go b/links/links_test.go
index e639e2c42e..4786c2f686 100644
--- a/links/links_test.go
+++ b/links/links_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 func TestLinkNaming(t *testing.T) {
diff --git a/nat/nat.go b/pkg/nat/nat.go
similarity index 100%
rename from nat/nat.go
rename to pkg/nat/nat.go
diff --git a/nat/nat_test.go b/pkg/nat/nat_test.go
similarity index 100%
rename from nat/nat_test.go
rename to pkg/nat/nat_test.go
diff --git a/nat/sort.go b/pkg/nat/sort.go
similarity index 100%
rename from nat/sort.go
rename to pkg/nat/sort.go
diff --git a/nat/sort_test.go b/pkg/nat/sort_test.go
similarity index 100%
rename from nat/sort_test.go
rename to pkg/nat/sort_test.go
diff --git a/runconfig/config.go b/runconfig/config.go
index 2a7f289f26..2196828d10 100644
--- a/runconfig/config.go
+++ b/runconfig/config.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 // Entrypoint encapsulates the container entrypoint.
diff --git a/runconfig/config_test.go b/runconfig/config_test.go
index 6be68b6cc8..7c445e6d6a 100644
--- a/runconfig/config_test.go
+++ b/runconfig/config_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 func parse(t *testing.T, args string) (*Config, *HostConfig, error) {
diff --git a/runconfig/hostconfig.go b/runconfig/hostconfig.go
index 5df9fa467a..8223ef6067 100644
--- a/runconfig/hostconfig.go
+++ b/runconfig/hostconfig.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/ulimit"
 )
 
diff --git a/runconfig/merge.go b/runconfig/merge.go
index c0eb450bdc..7d4cde06c8 100644
--- a/runconfig/merge.go
+++ b/runconfig/merge.go
@@ -3,7 +3,7 @@ package runconfig
 import (
 	"strings"
 
-	"github.com/docker/docker/nat"
+	"github.com/docker/docker/pkg/nat"
 )
 
 func Merge(userConf, imageConf *Config) error {
diff --git a/runconfig/parse.go b/runconfig/parse.go
index 11884b4a6a..5798e900a4 100644
--- a/runconfig/parse.go
+++ b/runconfig/parse.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/nat"
 	"github.com/docker/docker/opts"
 	flag "github.com/docker/docker/pkg/mflag"
+	"github.com/docker/docker/pkg/nat"
 	"github.com/docker/docker/pkg/parsers"
 	"github.com/docker/docker/pkg/ulimit"
 	"github.com/docker/docker/pkg/units"