diff --git a/container.go b/container.go
index f81c374254..fc92c26444 100644
--- a/container.go
+++ b/container.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"fmt"
 	"github.com/dotcloud/docker/archive"
-	"github.com/dotcloud/docker/cgroups"
 	"github.com/dotcloud/docker/execdriver"
 	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/pkg/term"
 	"github.com/dotcloud/docker/utils"
diff --git a/execdriver/driver.go b/execdriver/driver.go
index 5f3d25a566..3e0210bf3e 100644
--- a/execdriver/driver.go
+++ b/execdriver/driver.go
@@ -2,7 +2,7 @@ package execdriver
 
 import (
 	"errors"
-	"github.com/dotcloud/docker/cgroups"
+	"github.com/dotcloud/docker/pkg/cgroups"
 	"os/exec"
 	"syscall"
 )
diff --git a/execdriver/lxc/lxc_template.go b/execdriver/lxc/lxc_template.go
index deaa7a66ae..ac3481836d 100644
--- a/execdriver/lxc/lxc_template.go
+++ b/execdriver/lxc/lxc_template.go
@@ -1,7 +1,7 @@
 package lxc
 
 import (
-	"github.com/dotcloud/docker/cgroups"
+	"github.com/dotcloud/docker/pkg/cgroups"
 	"strings"
 	"text/template"
 )
diff --git a/execdriver/lxc/lxc_template_unit_test.go b/execdriver/lxc/lxc_template_unit_test.go
index fe65fe5cbc..8ea27646ec 100644
--- a/execdriver/lxc/lxc_template_unit_test.go
+++ b/execdriver/lxc/lxc_template_unit_test.go
@@ -3,8 +3,8 @@ package lxc
 import (
 	"bufio"
 	"fmt"
-	"github.com/dotcloud/docker/cgroups"
 	"github.com/dotcloud/docker/execdriver"
+	"github.com/dotcloud/docker/pkg/cgroups"
 	"io/ioutil"
 	"math/rand"
 	"os"
diff --git a/cgroups/MAINTAINERS b/pkg/cgroups/MAINTAINERS
similarity index 100%
rename from cgroups/MAINTAINERS
rename to pkg/cgroups/MAINTAINERS
diff --git a/cgroups/cgroups.go b/pkg/cgroups/cgroups.go
similarity index 100%
rename from cgroups/cgroups.go
rename to pkg/cgroups/cgroups.go
diff --git a/cgroups/cgroups_test.go b/pkg/cgroups/cgroups_test.go
similarity index 100%
rename from cgroups/cgroups_test.go
rename to pkg/cgroups/cgroups_test.go
diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go
index f9bd6b8a90..b3463f8cfe 100644
--- a/pkg/sysinfo/sysinfo.go
+++ b/pkg/sysinfo/sysinfo.go
@@ -1,7 +1,7 @@
 package sysinfo
 
 import (
-	"github.com/dotcloud/docker/cgroups" // FIXME: move cgroups in pkg
+	"github.com/dotcloud/docker/pkg/cgroups"
 	"io/ioutil"
 	"log"
 	"os"
diff --git a/server.go b/server.go
index a25ba74a06..b3e858ba2d 100644
--- a/server.go
+++ b/server.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/auth"
-	"github.com/dotcloud/docker/cgroups"
 	"github.com/dotcloud/docker/engine"
+	"github.com/dotcloud/docker/pkg/cgroups"
 	"github.com/dotcloud/docker/pkg/graphdb"
 	"github.com/dotcloud/docker/registry"
 	"github.com/dotcloud/docker/utils"