diff --git a/go.mod b/go.mod
index 66ea58a..72b6049 100644
--- a/go.mod
+++ b/go.mod
@@ -10,11 +10,11 @@ require (
 	github.com/libp2p/go-buffer-pool v0.0.1
 	github.com/libp2p/go-libp2p-crypto v0.0.1
 	github.com/libp2p/go-libp2p-peer v0.0.1
+	github.com/multiformats/go-base32 v0.0.3
 	github.com/multiformats/go-multiaddr v0.0.1
 	github.com/multiformats/go-multiaddr-net v0.0.1
 	github.com/multiformats/go-multihash v0.0.1
 	github.com/pkg/errors v0.8.1
-	github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc
 	github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1
 	github.com/whyrusleeping/mafmt v1.2.8
 )
diff --git a/go.sum b/go.sum
index 7d8aa7c..67176d5 100644
--- a/go.sum
+++ b/go.sum
@@ -79,6 +79,8 @@ github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16 h1:5W7KhL8HVF3XC
 github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/mr-tron/base58 v1.1.0 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
+github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
+github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-multiaddr v0.0.1 h1:/QUV3VBMDI6pi6xfiw7lr6xhDWWvQKn9udPn68kLSdY=
 github.com/multiformats/go-multiaddr v0.0.1/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr-dns v0.0.1 h1:jQt9c6tDSdQLIlBo4tXYx7QUHCPjxsB1zXcag/2S7zc=
@@ -103,8 +105,6 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc h1:BCPnHtcboadS0DvysUuJXZ4lWVv5Bh5i7+tbIyi+ck4=
-github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod h1:r45hJU7yEoA81k6MWNhpMj/kms0n14dkzkxYHoB96UM=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc h1:9lDbC6Rz4bwmou+oE6Dt4Cb2BGMur5eR/GYptkKUVHo=
diff --git a/package.json b/package.json
index 4532cc1..d796696 100644
--- a/package.json
+++ b/package.json
@@ -77,17 +77,17 @@
       "name": "go-buffer-pool",
       "version": "0.1.3"
     },
-    {
-      "author": "whyrusleeping",
-      "hash": "QmfVj3x4D6Jkq9SEoi5n2NmoUomLwoeiwnYz2KQa15wRw6",
-      "name": "base32",
-      "version": "0.0.2"
-    },
     {
       "author": "whyrusleeping",
       "hash": "QmbgYmpUkuCDnXi4hci3Jt797iVXbpuBKRTCqGz57h48Sk",
       "name": "go-ds-leveldb",
       "version": "1.3.0"
+    },
+    {
+      "author": "Golang",
+      "hash": "QmPbbYin7KBd1Y1BfUe15vHzwJiioyi3wtKQTtXWWf8SC5",
+      "name": "base32",
+      "version": "0.0.3"
     }
   ],
   "gxVersion": "0.4.0",
diff --git a/pstoreds/addr_book.go b/pstoreds/addr_book.go
index 9690bd5..faef34b 100644
--- a/pstoreds/addr_book.go
+++ b/pstoreds/addr_book.go
@@ -17,8 +17,8 @@ import (
 	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
 
 	lru "github.com/hashicorp/golang-lru"
+	b32 "github.com/multiformats/go-base32"
 	ma "github.com/multiformats/go-multiaddr"
-	b32 "github.com/whyrusleeping/base32"
 )
 
 type ttlWriteMode int
diff --git a/pstoreds/addr_book_gc.go b/pstoreds/addr_book_gc.go
index f40d553..8c66025 100644
--- a/pstoreds/addr_book_gc.go
+++ b/pstoreds/addr_book_gc.go
@@ -12,7 +12,7 @@ import (
 	peer "github.com/libp2p/go-libp2p-peer"
 	pb "github.com/libp2p/go-libp2p-peerstore/pb"
 
-	b32 "github.com/whyrusleeping/base32"
+	b32 "github.com/multiformats/go-base32"
 )
 
 var (
diff --git a/pstoreds/keybook.go b/pstoreds/keybook.go
index 8dcc826..29885c5 100644
--- a/pstoreds/keybook.go
+++ b/pstoreds/keybook.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	base32 "github.com/whyrusleeping/base32"
+	base32 "github.com/multiformats/go-base32"
 
 	ds "github.com/ipfs/go-datastore"
 	query "github.com/ipfs/go-datastore/query"
diff --git a/pstoreds/metadata.go b/pstoreds/metadata.go
index 7c1d124..dca550c 100644
--- a/pstoreds/metadata.go
+++ b/pstoreds/metadata.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/gob"
 
-	base32 "github.com/whyrusleeping/base32"
+	base32 "github.com/multiformats/go-base32"
 
 	ds "github.com/ipfs/go-datastore"
 
diff --git a/pstoreds/peerstore.go b/pstoreds/peerstore.go
index fc0263d..be7b09e 100644
--- a/pstoreds/peerstore.go
+++ b/pstoreds/peerstore.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	base32 "github.com/whyrusleeping/base32"
+	base32 "github.com/multiformats/go-base32"
 
 	ds "github.com/ipfs/go-datastore"
 	query "github.com/ipfs/go-datastore/query"