diff --git a/.gx/lastpubver b/.gx/lastpubver
index 3ef67d49114a20eaf56f55178b79fbc741ab5988..567104d360217693c8b40bd7067ba337f907066b 100644
--- a/.gx/lastpubver
+++ b/.gx/lastpubver
@@ -1 +1 @@
-0.2.4: QmTBRnrFwj2ZfE6NMEhzKtgv5QmLpwCfyvYsQmt2M9rcZG
+0.2.5: QmYAri1etRFXVrE7bkFSdpAMpoTiSCUTQnKpuDMPA2feCp
diff --git a/chan.go b/chan.go
index 51180d7cf405c73763ce42885809f16a1a957647..072c399b27ee44e60e37efbad5db2a4875f565d0 100644
--- a/chan.go
+++ b/chan.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 func NewChanResponsePair(req Request) (ResponseEmitter, Response) {
diff --git a/cli/helptext.go b/cli/helptext.go
index 623234d7bd6d8ad58952094338d624358b9f4a20..0478df87e8639ce7d5684a07ac6a43b0ee357bf4 100644
--- a/cli/helptext.go
+++ b/cli/helptext.go
@@ -8,7 +8,7 @@ import (
 	"text/template"
 
 	"github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 const (
diff --git a/cli/helptext_test.go b/cli/helptext_test.go
index 41a0899cfda3aba02292dab7f1ec19f0b2f6c3bf..80055cb4ea7a24603b7f51040d517525a743731a 100644
--- a/cli/helptext_test.go
+++ b/cli/helptext_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 func TestSynopsisGenerator(t *testing.T) {
diff --git a/cli/parse.go b/cli/parse.go
index ff7916209d95b71720b808e974d156974ecc7297..93d730995f9b8308ad4e07ebd0aac4693c532426 100644
--- a/cli/parse.go
+++ b/cli/parse.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 
 	"github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit/files"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit/files"
 
 	logging "gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
 	u "gx/ipfs/QmWbjfz3u6HkAdPh34dgPchGbQjob6LXLhAeCGii2TX69n/go-ipfs-util"
diff --git a/cli/parse_test.go b/cli/parse_test.go
index 97ff8154be312df62697f9be668e142e3165c24d..1432b2c4227927fd84dea7db9edcf0665ae7326e 100644
--- a/cli/parse_test.go
+++ b/cli/parse_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 type kvs map[string]interface{}
diff --git a/cli/reponseemitter.go b/cli/reponseemitter.go
index 2aa5c9d1997780d22052f1a8b1d9b7d0f7e0c401..c1b968bbe44709fad10dcaa86b3e0fa98b83f491 100644
--- a/cli/reponseemitter.go
+++ b/cli/reponseemitter.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 
 	"github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 type ErrSet struct {
@@ -124,9 +124,7 @@ func (re *responseEmitter) Emit(v interface{}) error {
 		return nil
 
 	case io.Reader:
-		var n int64
-
-		n, err = io.Copy(re.w, t)
+		_, err = io.Copy(re.w, t)
 		if err != nil {
 			re.SetError(err, cmdsutil.ErrNormal)
 			err = nil
diff --git a/command.go b/command.go
index c01d51c0b29c257fb3618000905f7615e2362fa9..d787ac8d969ac37a01633d314a373fb40ed3c71f 100644
--- a/command.go
+++ b/command.go
@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"io"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 
 	oldcmds "github.com/ipfs/go-ipfs/commands"
 	"github.com/ipfs/go-ipfs/path"
diff --git a/command_test.go b/command_test.go
index e91efc9ccf3fa35bd1781a63da9112da2e0b15a2..afa0ef229f21f7088572eed7ba14c862cb0d186a 100644
--- a/command_test.go
+++ b/command_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 // nopClose implements io.Close and does nothing
diff --git a/http/client.go b/http/client.go
index 42b2aa9491721729cf80d39e10eff2076ad93dbb..57ebe260073898659c5b3cde54284f5829a252eb 100644
--- a/http/client.go
+++ b/http/client.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 
 	config "github.com/ipfs/go-ipfs/repo/config"
 )
diff --git a/http/multifilereader.go b/http/multifilereader.go
index 79e82dc75db922ceaebef7cb9cb68d059895350a..20c0a15e7925dd00e056b0d8f2038c9ed9d05c91 100644
--- a/http/multifilereader.go
+++ b/http/multifilereader.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"sync"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit/files"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit/files"
 )
 
 // MultiFileReader reads from a `commands.File` (which can be a directory of files
diff --git a/http/multifilereader_test.go b/http/multifilereader_test.go
index ab03d6b37e174c6d979be0e70c169b17305dcaaf..e342e9286745a95d3068f321e00048d1dd349cc5 100644
--- a/http/multifilereader_test.go
+++ b/http/multifilereader_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit/files"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit/files"
 )
 
 func TestOutput(t *testing.T) {
diff --git a/http/parse.go b/http/parse.go
index 496e06affe08ab84e48a41ebdb13562218be0991..4d6f84f7ff79dcc5153bcab81ae37961fa617a75 100644
--- a/http/parse.go
+++ b/http/parse.go
@@ -9,8 +9,8 @@ import (
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	path "github.com/ipfs/go-ipfs/path"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit/files"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit/files"
 )
 
 // Parse parses the data in a http.Request and returns a command Request object
diff --git a/http/response.go b/http/response.go
index 057bf4c15ab86ae9d3733c0919beb7b746d86ddc..59b05e00369b42051b1ae7cac6f4cc16d2485d1d 100644
--- a/http/response.go
+++ b/http/response.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 type Response struct {
diff --git a/http/responseemitter.go b/http/responseemitter.go
index 285dc00b125bd8d5a5779064bb77457fbc189e4b..19babbf966f6c7592269474709e70f2588c0ce6f 100644
--- a/http/responseemitter.go
+++ b/http/responseemitter.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 
 	"github.com/ipfs/go-ipfs/repo/config"
 )
diff --git a/legacy.go b/legacy.go
index 021bc3017af5704b87dfb16e895000c66c04cccd..4278d2cf21098e72fc124a469ce19e35b81d866e 100644
--- a/legacy.go
+++ b/legacy.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 
 	oldcmds "github.com/ipfs/go-ipfs/commands"
 	core "github.com/ipfs/go-ipfs/core"
diff --git a/package.json b/package.json
index 76bca6c86792843f42c58d21a2d4d63623a7985c..3bf0f9ce5a200906d52a934a541a973f4fe820fb 100644
--- a/package.json
+++ b/package.json
@@ -25,15 +25,15 @@
       "version": "1.2.4"
     },
     {
-      "hash": "QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C",
+      "hash": "QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo",
       "name": "go-ipfs-cmdkit",
-      "version": "0.2.0"
+      "version": "0.2.1"
     }
   ],
   "gxVersion": "0.10.0",
   "language": "go",
   "license": "MIT",
   "name": "go-ipfs-cmds",
-  "version": "0.2.4"
+  "version": "0.2.5"
 }
 
diff --git a/request.go b/request.go
index edd5d1eb94d374b8591169781f574690281baba6..e72717f360f49a052250cd92c31d5cc70afc042d 100644
--- a/request.go
+++ b/request.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"time"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit/files"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit/files"
 
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/ipfs/go-ipfs/repo/config"
diff --git a/response.go b/response.go
index ae9f0982221549414d0bfbd1d4d89e72449d1468..65476dd24694fa1bc7eba3f18b38584698a865bd 100644
--- a/response.go
+++ b/response.go
@@ -3,7 +3,7 @@ package cmds
 import (
 	"fmt"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 var (
diff --git a/response_test.go b/response_test.go
index b4acaed50fb186712d5610de5326a58c9d3256a4..3e5189e45452818efb79c0767ce3147401c333a2 100644
--- a/response_test.go
+++ b/response_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 type TestOutput struct {
diff --git a/responseemitter.go b/responseemitter.go
index cce8cffbf3ceb10ad7f7baca60244991a33f4d80..22c59f37c08c208e5b7fc563043e3d0429ffa115 100644
--- a/responseemitter.go
+++ b/responseemitter.go
@@ -3,7 +3,7 @@ package cmds
 import (
 	"io"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 // ResponseEmitter encodes and sends the command code's output to the client.
diff --git a/teeemitter.go b/teeemitter.go
index d43cd81f93e025b2d1dc16e1c2f72192f55bdc90..da285d07401132a00af199c7e8238a2a0fa10e9c 100644
--- a/teeemitter.go
+++ b/teeemitter.go
@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 // NewTeeEmitter creates a new ResponseEmitter.
diff --git a/writer.go b/writer.go
index a88728b1c5f02f1a12d56563c02bc959c4bcd4de..cdcac386ece382e7f1c267697cfef201c1d8cf8a 100644
--- a/writer.go
+++ b/writer.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"sync"
 
-	"gx/ipfs/QmYiqbfRCkryYvJsxBopy77YEhxNZXTmq5Y2qiKyenc59C/go-ipfs-cmdkit"
+	"gx/ipfs/QmadYQbq2fJpaRE3XhpMLH68NNxmWMwfMQy1ntr1cKf7eo/go-ipfs-cmdkit"
 )
 
 func NewWriterResponseEmitter(w io.WriteCloser, req Request, enc func(Request) func(io.Writer) Encoder) *WriterResponseEmitter {