diff --git a/conn_linux.go b/conn_linux.go
index 2b3a51e..9ebbeb1 100644
--- a/conn_linux.go
+++ b/conn_linux.go
@@ -18,7 +18,7 @@ package main
 
 import (
 	"errors"
-	"git.zx2c4.com/wireguard-go/rwcancel"
+	"golang.zx2c4.com/wireguard/rwcancel"
 	"golang.org/x/sys/unix"
 	"net"
 	"strconv"
diff --git a/device.go b/device.go
index 1b5f808..2538648 100644
--- a/device.go
+++ b/device.go
@@ -6,8 +6,8 @@
 package main
 
 import (
-	"git.zx2c4.com/wireguard-go/ratelimiter"
-	"git.zx2c4.com/wireguard-go/tun"
+	"golang.zx2c4.com/wireguard/ratelimiter"
+	"golang.zx2c4.com/wireguard/tun"
 	"runtime"
 	"sync"
 	"sync/atomic"
diff --git a/go.mod b/go.mod
index 2fe6255..cfff5b6 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module git.zx2c4.com/wireguard-go
+module golang.zx2c4.com/wireguard
 
 require (
 	github.com/Microsoft/go-winio v0.4.11
diff --git a/helper_test.go b/helper_test.go
index 45e49e9..3705c97 100644
--- a/helper_test.go
+++ b/helper_test.go
@@ -8,7 +8,7 @@ package main
 import (
 	"bytes"
 	"errors"
-	"git.zx2c4.com/wireguard-go/tun"
+	"golang.zx2c4.com/wireguard/tun"
 	"os"
 	"testing"
 )
diff --git a/keypair.go b/keypair.go
index 5530d6a..af10a58 100644
--- a/keypair.go
+++ b/keypair.go
@@ -7,7 +7,7 @@ package main
 
 import (
 	"crypto/cipher"
-	"git.zx2c4.com/wireguard-go/replay"
+	"golang.zx2c4.com/wireguard/replay"
 	"sync"
 	"time"
 )
diff --git a/main.go b/main.go
index 6779fc1..23a1d2d 100644
--- a/main.go
+++ b/main.go
@@ -9,7 +9,7 @@ package main
 
 import (
 	"fmt"
-	"git.zx2c4.com/wireguard-go/tun"
+	"golang.zx2c4.com/wireguard/tun"
 	"os"
 	"os/signal"
 	"runtime"
diff --git a/main_windows.go b/main_windows.go
index f28deb4..7104a20 100644
--- a/main_windows.go
+++ b/main_windows.go
@@ -11,7 +11,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"git.zx2c4.com/wireguard-go/tun"
+	"golang.zx2c4.com/wireguard/tun"
 )
 
 const (
diff --git a/noise-protocol.go b/noise-protocol.go
index c5c6889..cb5d467 100644
--- a/noise-protocol.go
+++ b/noise-protocol.go
@@ -7,7 +7,7 @@ package main
 
 import (
 	"errors"
-	"git.zx2c4.com/wireguard-go/tai64n"
+	"golang.zx2c4.com/wireguard/tai64n"
 	"golang.org/x/crypto/blake2s"
 	"golang.org/x/crypto/chacha20poly1305"
 	"golang.org/x/crypto/poly1305"
diff --git a/tun.go b/tun.go
index 8419f12..52bfb68 100644
--- a/tun.go
+++ b/tun.go
@@ -6,7 +6,7 @@
 package main
 
 import (
-	"git.zx2c4.com/wireguard-go/tun"
+	"golang.zx2c4.com/wireguard/tun"
 	"sync/atomic"
 )
 
diff --git a/tun/tun_darwin.go b/tun/tun_darwin.go
index bf78bc5..9eef4e8 100644
--- a/tun/tun_darwin.go
+++ b/tun/tun_darwin.go
@@ -8,7 +8,7 @@ package tun
 import (
 	"errors"
 	"fmt"
-	"git.zx2c4.com/wireguard-go/rwcancel"
+	"golang.zx2c4.com/wireguard/rwcancel"
 	"golang.org/x/net/ipv6"
 	"golang.org/x/sys/unix"
 	"io/ioutil"
diff --git a/tun/tun_freebsd.go b/tun/tun_freebsd.go
index 9c16183..a2c4562 100644
--- a/tun/tun_freebsd.go
+++ b/tun/tun_freebsd.go
@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"git.zx2c4.com/wireguard-go/rwcancel"
+	"golang.zx2c4.com/wireguard/rwcancel"
 	"golang.org/x/net/ipv6"
 	"golang.org/x/sys/unix"
 	"net"
diff --git a/tun/tun_linux.go b/tun/tun_linux.go
index a9aec68..7a0647f 100644
--- a/tun/tun_linux.go
+++ b/tun/tun_linux.go
@@ -12,7 +12,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"git.zx2c4.com/wireguard-go/rwcancel"
+	"golang.zx2c4.com/wireguard/rwcancel"
 	"golang.org/x/net/ipv6"
 	"golang.org/x/sys/unix"
 	"net"
diff --git a/tun/tun_openbsd.go b/tun/tun_openbsd.go
index 0fe73b6..ab4c87b 100644
--- a/tun/tun_openbsd.go
+++ b/tun/tun_openbsd.go
@@ -8,7 +8,7 @@ package tun
 import (
 	"errors"
 	"fmt"
-	"git.zx2c4.com/wireguard-go/rwcancel"
+	"golang.zx2c4.com/wireguard/rwcancel"
 	"golang.org/x/net/ipv6"
 	"golang.org/x/sys/unix"
 	"io/ioutil"
diff --git a/tun/tun_windows.go b/tun/tun_windows.go
index 0bfd847..bdf692a 100644
--- a/tun/tun_windows.go
+++ b/tun/tun_windows.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"unsafe"
 
-	"git.zx2c4.com/wireguard-go/tun/wintun"
+	"golang.zx2c4.com/wireguard/tun/wintun"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/tun/wintun/setupapi/setupapi_windows_test.go b/tun/wintun/setupapi/setupapi_windows_test.go
index 3fcf2bb..cec95d5 100644
--- a/tun/wintun/setupapi/setupapi_windows_test.go
+++ b/tun/wintun/setupapi/setupapi_windows_test.go
@@ -10,7 +10,7 @@ import (
 	"syscall"
 	"testing"
 
-	"git.zx2c4.com/wireguard-go/tun/wintun/guid"
+	"golang.zx2c4.com/wireguard/tun/wintun/guid"
 	"golang.org/x/sys/windows"
 )
 
diff --git a/tun/wintun/wintun_windows.go b/tun/wintun/wintun_windows.go
index 6cc7bbb..a8fe3fa 100644
--- a/tun/wintun/wintun_windows.go
+++ b/tun/wintun/wintun_windows.go
@@ -13,8 +13,8 @@ import (
 	"time"
 	"unsafe"
 
-	"git.zx2c4.com/wireguard-go/tun/wintun/guid"
-	"git.zx2c4.com/wireguard-go/tun/wintun/setupapi"
+	"golang.zx2c4.com/wireguard/tun/wintun/guid"
+	"golang.zx2c4.com/wireguard/tun/wintun/setupapi"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/registry"
 )
diff --git a/uapi_linux.go b/uapi_linux.go
index c4e28f3..13d8b0d 100644
--- a/uapi_linux.go
+++ b/uapi_linux.go
@@ -8,7 +8,7 @@ package main
 import (
 	"errors"
 	"fmt"
-	"git.zx2c4.com/wireguard-go/rwcancel"
+	"golang.zx2c4.com/wireguard/rwcancel"
 	"golang.org/x/sys/unix"
 	"net"
 	"os"