diff --git a/adder/adder.go b/adder/adder.go
index 44f6c6a7..3389de4e 100644
--- a/adder/adder.go
+++ b/adder/adder.go
@@ -13,7 +13,7 @@ import (
 	"github.com/ipfs/ipfs-cluster/api"
 
 	cid "github.com/ipfs/go-cid"
-	files "github.com/ipfs/go-ipfs-cmdkit/files"
+	files "github.com/ipfs/go-ipfs-files"
 	ipld "github.com/ipfs/go-ipld-format"
 	logging "github.com/ipfs/go-log"
 	merkledag "github.com/ipfs/go-merkledag"
diff --git a/adder/ipfsadd/add.go b/adder/ipfsadd/add.go
index 81e0ea8c..9c47c403 100644
--- a/adder/ipfsadd/add.go
+++ b/adder/ipfsadd/add.go
@@ -11,7 +11,7 @@ import (
 
 	cid "github.com/ipfs/go-cid"
 	chunker "github.com/ipfs/go-ipfs-chunker"
-	files "github.com/ipfs/go-ipfs-cmdkit/files"
+	files "github.com/ipfs/go-ipfs-files"
 	posinfo "github.com/ipfs/go-ipfs-posinfo"
 	ipld "github.com/ipfs/go-ipld-format"
 	logging "github.com/ipfs/go-log"
diff --git a/api/rest/client/client.go b/api/rest/client/client.go
index e9cdded3..e93feb27 100644
--- a/api/rest/client/client.go
+++ b/api/rest/client/client.go
@@ -9,12 +9,11 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/ipfs/go-ipfs-cmdkit/files"
-
 	"github.com/ipfs/ipfs-cluster/api"
 
 	cid "github.com/ipfs/go-cid"
 	shell "github.com/ipfs/go-ipfs-api"
+	files "github.com/ipfs/go-ipfs-files"
 	logging "github.com/ipfs/go-log"
 	host "github.com/libp2p/go-libp2p-host"
 	peer "github.com/libp2p/go-libp2p-peer"
diff --git a/api/rest/client/methods.go b/api/rest/client/methods.go
index 0a133adc..2fcba6dc 100644
--- a/api/rest/client/methods.go
+++ b/api/rest/client/methods.go
@@ -15,7 +15,7 @@ import (
 	"github.com/ipfs/ipfs-cluster/api"
 
 	cid "github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-cmdkit/files"
+	files "github.com/ipfs/go-ipfs-files"
 	peer "github.com/libp2p/go-libp2p-peer"
 )
 
diff --git a/ipfsconn/ipfshttp/ipfshttp.go b/ipfsconn/ipfshttp/ipfshttp.go
index 7b7d2c5a..288a797f 100644
--- a/ipfsconn/ipfshttp/ipfshttp.go
+++ b/ipfsconn/ipfshttp/ipfshttp.go
@@ -24,7 +24,7 @@ import (
 	"github.com/ipfs/ipfs-cluster/rpcutil"
 
 	cid "github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-cmdkit/files"
+	files "github.com/ipfs/go-ipfs-files"
 	logging "github.com/ipfs/go-log"
 	rpc "github.com/libp2p/go-libp2p-gorpc"
 	peer "github.com/libp2p/go-libp2p-peer"
diff --git a/package.json b/package.json
index 6a4c1a92..e40952bc 100644
--- a/package.json
+++ b/package.json
@@ -132,11 +132,6 @@
       "name": "go-libp2p-kad-dht",
       "version": "4.4.8"
     },
-    {
-      "hash": "QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky",
-      "name": "go-ipfs-cmdkit",
-      "version": "1.1.3"
-    },
     {
       "author": "hsanjuan",
       "hash": "QmP2sH3hdhseUsoNBhAZSCkeUvTGgYXxvZjSB2s7yg4aoD",
@@ -148,6 +143,12 @@
       "hash": "QmYRGECuvQnRX73fcvPnGbYijBcGN2HbKZQ7jh26qmLiHG",
       "name": "semver",
       "version": "3.5.1"
+    },
+    {
+      "author": "magik6k",
+      "hash": "QmZMWMvWMVKCbHetJ4RgndbuEF1io2UpUxwQwtNjtYPzSC",
+      "name": "go-ipfs-files",
+      "version": "1.0.1"
     }
   ],
   "gxVersion": "0.11.0",
diff --git a/test/sharding.go b/test/sharding.go
index b766fd54..b6de9af1 100644
--- a/test/sharding.go
+++ b/test/sharding.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/ipfs/go-ipfs-cmdkit/files"
+	files "github.com/ipfs/go-ipfs-files"
 )
 
 const shardingTestDir = "shardTesting"