diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 8a33bddca..3440bba1a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -30,6 +30,10 @@
 			"ImportPath": "github.com/pkg/sftp",
 			"Rev": "518aed2757a65cfa64d4b1b2baf08410f8b7a6bc"
 		},
+		{
+			"ImportPath": "github.com/restic/chunker",
+			"Rev": "e795b80f4c927ebcf2687ce18bcf1a39fee740b1"
+		},
 		{
 			"ImportPath": "github.com/vaughan0/go-ini",
 			"Rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"
diff --git a/chunker/chunker.go b/Godeps/_workspace/src/github.com/restic/chunker/chunker.go
similarity index 100%
rename from chunker/chunker.go
rename to Godeps/_workspace/src/github.com/restic/chunker/chunker.go
diff --git a/chunker/chunker_test.go b/Godeps/_workspace/src/github.com/restic/chunker/chunker_test.go
similarity index 99%
rename from chunker/chunker_test.go
rename to Godeps/_workspace/src/github.com/restic/chunker/chunker_test.go
index 6a7f30a7d..9fa54f233 100644
--- a/chunker/chunker_test.go
+++ b/Godeps/_workspace/src/github.com/restic/chunker/chunker_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/restic/restic/chunker"
+	"github.com/restic/chunker"
 	. "github.com/restic/restic/test"
 )
 
diff --git a/chunker/doc.go b/Godeps/_workspace/src/github.com/restic/chunker/doc.go
similarity index 100%
rename from chunker/doc.go
rename to Godeps/_workspace/src/github.com/restic/chunker/doc.go
diff --git a/chunker/polynomials.go b/Godeps/_workspace/src/github.com/restic/chunker/polynomials.go
similarity index 100%
rename from chunker/polynomials.go
rename to Godeps/_workspace/src/github.com/restic/chunker/polynomials.go
diff --git a/chunker/polynomials_test.go b/Godeps/_workspace/src/github.com/restic/chunker/polynomials_test.go
similarity index 99%
rename from chunker/polynomials_test.go
rename to Godeps/_workspace/src/github.com/restic/chunker/polynomials_test.go
index edea1124e..bdfadd671 100644
--- a/chunker/polynomials_test.go
+++ b/Godeps/_workspace/src/github.com/restic/chunker/polynomials_test.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/restic/restic/chunker"
+	"github.com/restic/chunker"
 	. "github.com/restic/restic/test"
 )
 
diff --git a/archiver.go b/archiver.go
index bd48c1147..f54b13cc5 100644
--- a/archiver.go
+++ b/archiver.go
@@ -10,8 +10,8 @@ import (
 	"sort"
 	"sync"
 
+	"github.com/restic/chunker"
 	"github.com/restic/restic/backend"
-	"github.com/restic/restic/chunker"
 	"github.com/restic/restic/debug"
 	"github.com/restic/restic/pack"
 	"github.com/restic/restic/pipe"
diff --git a/archiver_test.go b/archiver_test.go
index c639be6ab..49b7137ec 100644
--- a/archiver_test.go
+++ b/archiver_test.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	"testing"
 
+	"github.com/restic/chunker"
 	"github.com/restic/restic"
 	"github.com/restic/restic/backend"
-	"github.com/restic/restic/chunker"
 	"github.com/restic/restic/crypto"
 	"github.com/restic/restic/pack"
 	. "github.com/restic/restic/test"
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index e8911c086..f255181ba 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/restic/restic/chunker"
+	"github.com/restic/chunker"
 	"github.com/restic/restic/crypto"
 	. "github.com/restic/restic/test"
 )
diff --git a/repository/config.go b/repository/config.go
index 46a9e778c..0d281b88b 100644
--- a/repository/config.go
+++ b/repository/config.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"io"
 
+	"github.com/restic/chunker"
 	"github.com/restic/restic/backend"
-	"github.com/restic/restic/chunker"
 	"github.com/restic/restic/debug"
 )
 
diff --git a/repository/pool.go b/repository/pool.go
index 258d08d92..9c7450d5c 100644
--- a/repository/pool.go
+++ b/repository/pool.go
@@ -3,7 +3,7 @@ package repository
 import (
 	"sync"
 
-	"github.com/restic/restic/chunker"
+	"github.com/restic/chunker"
 )
 
 var bufPool = sync.Pool{
diff --git a/repository/repository.go b/repository/repository.go
index 099227ed1..aa32adf8f 100644
--- a/repository/repository.go
+++ b/repository/repository.go
@@ -10,8 +10,8 @@ import (
 	"io/ioutil"
 	"sync"
 
+	"github.com/restic/chunker"
 	"github.com/restic/restic/backend"
-	"github.com/restic/restic/chunker"
 	"github.com/restic/restic/crypto"
 	"github.com/restic/restic/debug"
 	"github.com/restic/restic/pack"