diff --git a/README.md b/README.md
index d1409ec..cd13f85 100644
--- a/README.md
+++ b/README.md
@@ -311,7 +311,7 @@ MIT
 ## Credits
 Library | Use
 ------- | -----
-[github.com/flynn-archive/go-shlex](https://github.com/flynn-archive/go-shlex) | splitting input into command and args.
+[github.com/GetStream/go-shlex](https://github.com/GetStream/go-shlex) | splitting input into command and args.
 [github.com/chzyer/readline](https://github.com/chzyer/readline) | readline capabilities.
 
 
diff --git a/completer.go b/completer.go
index 4ffed29..e4e6586 100644
--- a/completer.go
+++ b/completer.go
@@ -3,7 +3,7 @@ package ishell
 import (
 	"strings"
 
-	"github.com/flynn-archive/go-shlex"
+	"github.com/GetStream/go-shlex"
 )
 
 type iCompleter struct {
diff --git a/ishell.go b/ishell.go
index 0202fb3..772b801 100644
--- a/ishell.go
+++ b/ishell.go
@@ -18,7 +18,7 @@ import (
 
 	"github.com/chzyer/readline"
 	"github.com/fatih/color"
-	"github.com/flynn-archive/go-shlex"
+	"github.com/GetStream/go-shlex"
 )
 
 const (