diff --git a/README.md b/README.md
index 3478d7520..0aea85bc1 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ You can use it as a MySQL slave to sync binlog from master then do something, li
 
 ```go
 import (
-	"github.com/siddontang/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/replication"
 	"os"
 )
 // Create a binlog syncer with a unique server id, the server id must be different from other MySQL's. 
@@ -124,7 +124,7 @@ package main
 
 import (
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/canal"
+	"github.com/go-mysql-org/go-mysql/canal"
 )
 
 type MyEventHandler struct {
@@ -171,7 +171,7 @@ Client package supports a simple MySQL connection driver which you can use it to
 
 ```go
 import (
-	"github.com/siddontang/go-mysql/client"
+	"github.com/go-mysql-org/go-mysql/client"
 )
 
 // Connect MySQL at 127.0.0.1:3306, with user root, an empty password and database test
@@ -253,7 +253,7 @@ so that most MySQL clients should be able to connect to the Server without modif
 
 ```go
 import (
-	"github.com/siddontang/go-mysql/server"
+	"github.com/go-mysql-org/go-mysql/server"
 	"net"
 )
 
@@ -307,7 +307,7 @@ package main
 import (
 	"database/sql"
 
-	_ "github.com/siddontang/go-mysql/driver"
+	_ "github.com/go-mysql-org/go-mysql/driver"
 )
 
 func main() {
diff --git a/canal/canal.go b/canal/canal.go
index 0ee2a432a..9745f11b3 100644
--- a/canal/canal.go
+++ b/canal/canal.go
@@ -12,14 +12,14 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/client"
+	"github.com/go-mysql-org/go-mysql/dump"
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/schema"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/client"
-	"github.com/siddontang/go-mysql/dump"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/replication"
-	"github.com/siddontang/go-mysql/schema"
 )
 
 // Canal can sync your MySQL data into everywhere, like Elasticsearch, Redis, etc...
diff --git a/canal/canal_test.go b/canal/canal_test.go
index 49dc72fb6..7f4f4c7d7 100644
--- a/canal/canal_test.go
+++ b/canal/canal_test.go
@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/replication"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/replication"
 )
 
 var testHost = flag.String("host", "127.0.0.1", "MySQL host")
diff --git a/canal/config.go b/canal/config.go
index b24c2a2da..5b97fae7a 100644
--- a/canal/config.go
+++ b/canal/config.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
+	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 type DumpConfig struct {
diff --git a/canal/dump.go b/canal/dump.go
index ff01dc880..59af3a433 100644
--- a/canal/dump.go
+++ b/canal/dump.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/schema"
 	"github.com/pingcap/errors"
 	"github.com/shopspring/decimal"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/schema"
 )
 
 type dumpParseHandler struct {
diff --git a/canal/handler.go b/canal/handler.go
index 284c7d156..ea12304b8 100644
--- a/canal/handler.go
+++ b/canal/handler.go
@@ -1,8 +1,8 @@
 package canal
 
 import (
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/replication"
 )
 
 type EventHandler interface {
diff --git a/canal/master.go b/canal/master.go
index dd4359703..510eceaef 100644
--- a/canal/master.go
+++ b/canal/master.go
@@ -3,8 +3,8 @@ package canal
 import (
 	"sync"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 type masterInfo struct {
diff --git a/canal/rows.go b/canal/rows.go
index 36d03865c..9e5df3981 100644
--- a/canal/rows.go
+++ b/canal/rows.go
@@ -3,8 +3,8 @@ package canal
 import (
 	"fmt"
 
-	"github.com/siddontang/go-mysql/replication"
-	"github.com/siddontang/go-mysql/schema"
+	"github.com/go-mysql-org/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/schema"
 )
 
 // The action name for sync.
diff --git a/canal/sync.go b/canal/sync.go
index d1b5892b4..f4d2841b6 100644
--- a/canal/sync.go
+++ b/canal/sync.go
@@ -5,13 +5,13 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/schema"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/ast"
 	uuid "github.com/satori/go.uuid"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/replication"
-	"github.com/siddontang/go-mysql/schema"
 )
 
 func (c *Canal) startSyncer() (*replication.BinlogStreamer, error) {
diff --git a/client/auth.go b/client/auth.go
index 8d639f31d..01217f834 100644
--- a/client/auth.go
+++ b/client/auth.go
@@ -6,9 +6,9 @@ import (
 	"encoding/binary"
 	"fmt"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/packet"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/packet"
 )
 
 const defaultAuthPluginName = AUTH_NATIVE_PASSWORD
diff --git a/client/client_test.go b/client/client_test.go
index 224b38adb..53d43c199 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -6,11 +6,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/go-mysql-org/go-mysql/test_util/test_keys"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/test_util/test_keys"
 
-	"github.com/siddontang/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/mysql"
 )
 
 var testHost = flag.String("host", "127.0.0.1", "MySQL server host")
diff --git a/client/conn.go b/client/conn.go
index 8229d22b7..1b3744466 100644
--- a/client/conn.go
+++ b/client/conn.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/packet"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/packet"
 )
 
 type Conn struct {
diff --git a/client/req.go b/client/req.go
index 87ad50606..df3cee214 100644
--- a/client/req.go
+++ b/client/req.go
@@ -1,7 +1,7 @@
 package client
 
 import (
-	"github.com/siddontang/go-mysql/utils"
+	"github.com/go-mysql-org/go-mysql/utils"
 )
 
 func (c *Conn) writeCommand(command byte) error {
diff --git a/client/resp.go b/client/resp.go
index 583b80264..5b6c114c5 100644
--- a/client/resp.go
+++ b/client/resp.go
@@ -7,9 +7,9 @@ import (
 	"encoding/binary"
 	"encoding/pem"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/utils"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/utils"
 	"github.com/siddontang/go/hack"
 )
 
diff --git a/client/stmt.go b/client/stmt.go
index 5569c45f3..239da78bc 100644
--- a/client/stmt.go
+++ b/client/stmt.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"math"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 type Stmt struct {
diff --git a/cmd/go-binlogparser/main.go b/cmd/go-binlogparser/main.go
index fa5b5cf3a..8189ad5c3 100644
--- a/cmd/go-binlogparser/main.go
+++ b/cmd/go-binlogparser/main.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 	"os"
 
-	"github.com/siddontang/go-mysql/replication"
+	"github.com/go-mysql-org/go-mysql/replication"
 )
 
 var name = flag.String("name", "", "binlog file name")
diff --git a/cmd/go-canal/main.go b/cmd/go-canal/main.go
index cdf75d7b6..9f7d59226 100644
--- a/cmd/go-canal/main.go
+++ b/cmd/go-canal/main.go
@@ -9,8 +9,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/siddontang/go-mysql/canal"
-	"github.com/siddontang/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/canal"
+	"github.com/go-mysql-org/go-mysql/mysql"
 )
 
 var host = flag.String("host", "127.0.0.1", "MySQL host")
diff --git a/cmd/go-mysqlbinlog/main.go b/cmd/go-mysqlbinlog/main.go
index e468aaaa1..6bbcc2559 100644
--- a/cmd/go-mysqlbinlog/main.go
+++ b/cmd/go-mysqlbinlog/main.go
@@ -9,9 +9,9 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/replication"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/replication"
 )
 
 var host = flag.String("host", "127.0.0.1", "MySQL host")
diff --git a/cmd/go-mysqldump/main.go b/cmd/go-mysqldump/main.go
index 306a2b744..92e74b319 100644
--- a/cmd/go-mysqldump/main.go
+++ b/cmd/go-mysqldump/main.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/go-mysql-org/go-mysql/dump"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/dump"
 )
 
 var addr = flag.String("addr", "127.0.0.1:3306", "MySQL addr")
diff --git a/driver/driver.go b/driver/driver.go
index 83d1f8a0d..c2653a80d 100644
--- a/driver/driver.go
+++ b/driver/driver.go
@@ -9,9 +9,9 @@ import (
 	"io"
 	"strings"
 
+	"github.com/go-mysql-org/go-mysql/client"
+	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/client"
-	"github.com/siddontang/go-mysql/mysql"
 	"github.com/siddontang/go/hack"
 )
 
diff --git a/dump/dumper.go b/dump/dumper.go
index 146f36b14..fdd250c5c 100644
--- a/dump/dumper.go
+++ b/dump/dumper.go
@@ -8,9 +8,9 @@ import (
 	"os/exec"
 	"strings"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
 	"github.com/siddontang/go-log/log"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 // Unlick mysqldump, Dumper is designed for parsing and syning data easily.
diff --git a/dump/parser.go b/dump/parser.go
index 4605e98ca..d4694a2a5 100644
--- a/dump/parser.go
+++ b/dump/parser.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 var (
diff --git a/dump/parser_test.go b/dump/parser_test.go
index 532d643b1..d3a33060f 100644
--- a/dump/parser_test.go
+++ b/dump/parser_test.go
@@ -3,8 +3,8 @@ package dump
 import (
 	"strings"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
 	. "github.com/pingcap/check"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 type parserTestSuite struct {
diff --git a/dump/schema_test.go b/dump/schema_test.go
index b8fc82446..52d69a752 100644
--- a/dump/schema_test.go
+++ b/dump/schema_test.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/go-mysql-org/go-mysql/client"
 	. "github.com/pingcap/check"
-	"github.com/siddontang/go-mysql/client"
 )
 
 type schemaTestSuite struct {
diff --git a/dump/setup_test.go b/dump/setup_test.go
index 5f8afb823..ca2d4d0b8 100644
--- a/dump/setup_test.go
+++ b/dump/setup_test.go
@@ -4,8 +4,8 @@ import (
 	"flag"
 	"testing"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
 	. "github.com/pingcap/check"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 // use docker mysql for test
diff --git a/failover/failover.go b/failover/failover.go
index d35994a1f..8fbd65c71 100644
--- a/failover/failover.go
+++ b/failover/failover.go
@@ -1,8 +1,8 @@
 package failover
 
 import (
+	"github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 // Failover will do below things after the master down
diff --git a/failover/mariadb_gtid_handler.go b/failover/mariadb_gtid_handler.go
index 7e1b8f8d7..b462e26c1 100644
--- a/failover/mariadb_gtid_handler.go
+++ b/failover/mariadb_gtid_handler.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 // Limiatation
diff --git a/failover/mysql_gtid_handler.go b/failover/mysql_gtid_handler.go
index c25c75714..bf6e8cdc7 100644
--- a/failover/mysql_gtid_handler.go
+++ b/failover/mysql_gtid_handler.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 type MysqlGTIDHandler struct {
diff --git a/failover/server.go b/failover/server.go
index 3c8d9315d..77d8b1b18 100644
--- a/failover/server.go
+++ b/failover/server.go
@@ -3,8 +3,8 @@ package failover
 import (
 	"fmt"
 
-	"github.com/siddontang/go-mysql/client"
-	. "github.com/siddontang/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/client"
+	. "github.com/go-mysql-org/go-mysql/mysql"
 )
 
 type User struct {
diff --git a/go.mod b/go.mod
index 7d7e4fae9..4163e70e5 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/siddontang/go-mysql
+module github.com/go-mysql-org/go-mysql
 
 go 1.16
 
diff --git a/go.sum b/go.sum
index 46a442040..723838246 100644
--- a/go.sum
+++ b/go.sum
@@ -164,6 +164,8 @@ github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 h1:xT+JlYxNGqyT+XcU8
 github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
 github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07 h1:oI+RNwuC9jF2g2lP0u0cVEEZrc/AYBCuFdvwrLWM/6Q=
 github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07/go.mod h1:yFdBgwXP24JziuRl2NMUahT7nGLNOKi1SIiFxMttVD4=
+github.com/go-mysql-org/go-mysql v1.1.1 h1:wxDpAS5+hHrwwdwhKtIWK+9bGDJ48Q7uZkeH8HW8kKY=
+github.com/go-mysql-org/go-mysql v1.1.1/go.mod h1:k333ujeKfrlgcl4cWUyX03L3bvJ718j9jKqeHh2C+Nc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
diff --git a/mysql/field.go b/mysql/field.go
index 884702503..e0f8e6f35 100644
--- a/mysql/field.go
+++ b/mysql/field.go
@@ -3,7 +3,7 @@ package mysql
 import (
 	"encoding/binary"
 
-	"github.com/siddontang/go-mysql/utils"
+	"github.com/go-mysql-org/go-mysql/utils"
 )
 
 type FieldData []byte
diff --git a/mysql/rowdata.go b/mysql/rowdata.go
index f5a493f1b..d3cfd0aec 100644
--- a/mysql/rowdata.go
+++ b/mysql/rowdata.go
@@ -3,8 +3,8 @@ package mysql
 import (
 	"strconv"
 
+	"github.com/go-mysql-org/go-mysql/utils"
 	"github.com/pingcap/errors"
-	"github.com/siddontang/go-mysql/utils"
 )
 
 type RowData []byte
diff --git a/packet/conn.go b/packet/conn.go
index 13a6f573a..c60f68e66 100644
--- a/packet/conn.go
+++ b/packet/conn.go
@@ -13,9 +13,9 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/utils"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/utils"
 )
 
 type BufPool struct {
diff --git a/replication/backup.go b/replication/backup.go
index cc854585a..c299ebc6c 100644
--- a/replication/backup.go
+++ b/replication/backup.go
@@ -7,8 +7,8 @@ import (
 	"path"
 	"time"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 // StartBackup: Like mysqlbinlog remote raw backup
diff --git a/replication/backup_test.go b/replication/backup_test.go
index bae46acbc..fbb606dc7 100644
--- a/replication/backup_test.go
+++ b/replication/backup_test.go
@@ -9,7 +9,7 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
 
-	"github.com/siddontang/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/mysql"
 )
 
 func (t *testSyncerSuite) TestStartBackupEndInGivenTime(c *C) {
diff --git a/replication/binlogsyncer.go b/replication/binlogsyncer.go
index 98ed98390..a5dfcb541 100644
--- a/replication/binlogsyncer.go
+++ b/replication/binlogsyncer.go
@@ -10,11 +10,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/client"
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
 	uuid "github.com/satori/go.uuid"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/client"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 var (
diff --git a/replication/event.go b/replication/event.go
index f34956163..90b38d371 100644
--- a/replication/event.go
+++ b/replication/event.go
@@ -13,7 +13,7 @@ import (
 	"github.com/pingcap/errors"
 	uuid "github.com/satori/go.uuid"
 
-	. "github.com/siddontang/go-mysql/mysql"
+	. "github.com/go-mysql-org/go-mysql/mysql"
 )
 
 const (
diff --git a/replication/json_binary.go b/replication/json_binary.go
index d2f8e84d7..ab6c07539 100644
--- a/replication/json_binary.go
+++ b/replication/json_binary.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"math"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 	"github.com/siddontang/go/hack"
 )
 
diff --git a/replication/replication_test.go b/replication/replication_test.go
index 62a35c2f2..621d7236e 100644
--- a/replication/replication_test.go
+++ b/replication/replication_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/client"
+	"github.com/go-mysql-org/go-mysql/mysql"
 	. "github.com/pingcap/check"
 	uuid "github.com/satori/go.uuid"
-	"github.com/siddontang/go-mysql/client"
-	"github.com/siddontang/go-mysql/mysql"
 )
 
 // Use docker mysql to test, mysql is 3306, mariadb is 3316
diff --git a/replication/row_event.go b/replication/row_event.go
index d96a328f1..06a201d99 100644
--- a/replication/row_event.go
+++ b/replication/row_event.go
@@ -9,10 +9,10 @@ import (
 	"strconv"
 	"time"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
 	"github.com/shopspring/decimal"
 	"github.com/siddontang/go-log/log"
-	. "github.com/siddontang/go-mysql/mysql"
 	"github.com/siddontang/go/hack"
 )
 
diff --git a/schema/schema.go b/schema/schema.go
index 6807c3b63..68448f6e3 100644
--- a/schema/schema.go
+++ b/schema/schema.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/pingcap/errors"
 
-	"github.com/siddontang/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/mysql"
 )
 
 var ErrTableNotExist = errors.New("table is not exist")
diff --git a/schema/schema_test.go b/schema/schema_test.go
index 5395bb8c4..b5636e6ae 100644
--- a/schema/schema_test.go
+++ b/schema/schema_test.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/go-mysql-org/go-mysql/client"
+	_ "github.com/go-mysql-org/go-mysql/driver"
 	. "github.com/pingcap/check"
-	"github.com/siddontang/go-mysql/client"
-	_ "github.com/siddontang/go-mysql/driver"
 )
 
 // use docker mysql for test
diff --git a/server/auth.go b/server/auth.go
index f8e6bd81c..0019e8ac2 100644
--- a/server/auth.go
+++ b/server/auth.go
@@ -9,8 +9,8 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 var ErrAccessDenied = errors.New("access denied")
diff --git a/server/auth_switch_response.go b/server/auth_switch_response.go
index 73ef90f44..44fea6abf 100644
--- a/server/auth_switch_response.go
+++ b/server/auth_switch_response.go
@@ -9,8 +9,8 @@ import (
 	"crypto/tls"
 	"fmt"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 func (c *Conn) handleAuthSwitchResponse() error {
diff --git a/server/caching_sha2_cache_test.go b/server/caching_sha2_cache_test.go
index 8db559d5e..d423b8775 100644
--- a/server/caching_sha2_cache_test.go
+++ b/server/caching_sha2_cache_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/test_util/test_keys"
 	_ "github.com/go-sql-driver/mysql"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/test_util/test_keys"
 )
 
 var delay = 50
diff --git a/server/command.go b/server/command.go
index 63fd9e442..50e4951b6 100644
--- a/server/command.go
+++ b/server/command.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	. "github.com/siddontang/go-mysql/mysql"
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/siddontang/go/hack"
 )
 
diff --git a/server/conn.go b/server/conn.go
index eb920d2b6..7f890fd7c 100644
--- a/server/conn.go
+++ b/server/conn.go
@@ -4,8 +4,8 @@ import (
 	"net"
 	"sync/atomic"
 
-	. "github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/packet"
+	. "github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/packet"
 	"github.com/siddontang/go/sync2"
 )
 
diff --git a/server/example/server_example.go b/server/example/server_example.go
index 2cb440c56..2af545566 100644
--- a/server/example/server_example.go
+++ b/server/example/server_example.go
@@ -3,10 +3,10 @@ package main
 import (
 	"net"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/server"
+	"github.com/go-mysql-org/go-mysql/test_util/test_keys"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/server"
-	"github.com/siddontang/go-mysql/test_util/test_keys"
 
 	"crypto/tls"
 	"time"
diff --git a/server/handshake_resp.go b/server/handshake_resp.go
index 4edef88df..13fd8e6c3 100644
--- a/server/handshake_resp.go
+++ b/server/handshake_resp.go
@@ -5,8 +5,8 @@ import (
 	"crypto/tls"
 	"encoding/binary"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 func (c *Conn) readHandshakeResponse() error {
diff --git a/server/resp.go b/server/resp.go
index db8632394..d8051c698 100644
--- a/server/resp.go
+++ b/server/resp.go
@@ -3,7 +3,7 @@ package server
 import (
 	"fmt"
 
-	. "github.com/siddontang/go-mysql/mysql"
+	. "github.com/go-mysql-org/go-mysql/mysql"
 )
 
 func (c *Conn) writeOK(r *Result) error {
diff --git a/server/server_conf.go b/server/server_conf.go
index 9ca5f1d9e..0449a172c 100644
--- a/server/server_conf.go
+++ b/server/server_conf.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sync"
 
-	. "github.com/siddontang/go-mysql/mysql"
+	. "github.com/go-mysql-org/go-mysql/mysql"
 )
 
 var defaultServer = NewDefaultServer()
diff --git a/server/server_test.go b/server/server_test.go
index 81e9a5182..03d97baff 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -10,12 +10,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-mysql-org/go-mysql/mysql"
+	"github.com/go-mysql-org/go-mysql/test_util/test_keys"
 	_ "github.com/go-sql-driver/mysql"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/errors"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go-mysql/mysql"
-	"github.com/siddontang/go-mysql/test_util/test_keys"
 )
 
 var testAddr = flag.String("addr", "127.0.0.1:4000", "MySQL proxy server address")
diff --git a/server/stmt.go b/server/stmt.go
index 171472070..84878ed3e 100644
--- a/server/stmt.go
+++ b/server/stmt.go
@@ -6,8 +6,8 @@ import (
 	"math"
 	"strconv"
 
+	. "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/pingcap/errors"
-	. "github.com/siddontang/go-mysql/mysql"
 )
 
 var paramFieldData []byte