diff --git a/Makefile b/Makefile
index e7e5577dc8..8e0dd2504f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ all: checks
 
 checks:
 	@go get -u github.com/go-ini/ini/...
-	@go get -u github.com/minio/go-homedir/...
+	@go get -u github.com/mitchellh/go-homedir/...
 	@go get -u github.com/cheggaaa/pb/...
 	@go get -u github.com/sirupsen/logrus/...
 	@go get -u github.com/dustin/go-humanize/...
diff --git a/appveyor.yml b/appveyor.yml
index 0f623d3d4c..79c7a15f2c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,7 +18,7 @@ install:
   - go env
   - go get -u github.com/golang/lint/golint
   - go get -u github.com/go-ini/ini
-  - go get -u github.com/minio/go-homedir
+  - go get -u github.com/mitchellh/go-homedir
   - go get -u github.com/remyoudompheng/go-misc/deadcode
   - go get -u github.com/gordonklaus/ineffassign
   - go get -u github.com/dustin/go-humanize
diff --git a/pkg/credentials/file_aws_credentials.go b/pkg/credentials/file_aws_credentials.go
index 247b6a11a4..5ad68303a5 100644
--- a/pkg/credentials/file_aws_credentials.go
+++ b/pkg/credentials/file_aws_credentials.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 
 	"github.com/go-ini/ini"
-	homedir "github.com/minio/go-homedir"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 // A FileAWSCredentials retrieves credentials from the current user's home
diff --git a/pkg/credentials/file_minio_client.go b/pkg/credentials/file_minio_client.go
index 2f79809e9f..c282c2a2c9 100644
--- a/pkg/credentials/file_minio_client.go
+++ b/pkg/credentials/file_minio_client.go
@@ -24,7 +24,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	homedir "github.com/minio/go-homedir"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 // A FileMinioClient retrieves credentials from the current user's home