diff --git a/irc/accountreg.go b/irc/accountreg.go
index 5b2fddfd..eaae39e4 100644
--- a/irc/accountreg.go
+++ b/irc/accountreg.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
 )
diff --git a/irc/accounts.go b/irc/accounts.go
index 0c6b111f..ba06f852 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
 )
diff --git a/irc/capability.go b/irc/capability.go
index d37fb94c..5284ce17 100644
--- a/irc/capability.go
+++ b/irc/capability.go
@@ -7,7 +7,7 @@ package irc
 import (
 	"strings"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 // Capability represents an optional feature that a client may request from the server.
diff --git a/irc/channel.go b/irc/channel.go
index 618d90cb..5a4ee2c1 100644
--- a/irc/channel.go
+++ b/irc/channel.go
@@ -13,7 +13,7 @@ import (
 
 	"sync"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/tidwall/buntdb"
 )
 
diff --git a/irc/chanserv.go b/irc/chanserv.go
index 04594c19..99f0ba7a 100644
--- a/irc/chanserv.go
+++ b/irc/chanserv.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
 )
diff --git a/irc/client.go b/irc/client.go
index 4a5147c4..c5b04b14 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -16,8 +16,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmsg"
 	ident "github.com/oragono/go-ident"
 	"github.com/oragono/oragono/irc/sno"
 )
diff --git a/irc/client_lookup_set.go b/irc/client_lookup_set.go
index 7ddde739..b636b7a0 100644
--- a/irc/client_lookup_set.go
+++ b/irc/client_lookup_set.go
@@ -11,9 +11,9 @@ import (
 	"regexp"
 	"strings"
 
-	"sync"
+	"github.com/goshuirc/irc-go/ircmatch"
 
-	"github.com/DanielOaks/girc-go/ircmatch"
+	"sync"
 )
 
 var (
diff --git a/irc/commands.go b/irc/commands.go
index 21a50147..5bf80abd 100644
--- a/irc/commands.go
+++ b/irc/commands.go
@@ -5,9 +5,7 @@
 
 package irc
 
-import (
-	"github.com/DanielOaks/girc-go/ircmsg"
-)
+import "github.com/goshuirc/irc-go/ircmsg"
 
 // Command represents a command accepted from a client.
 type Command struct {
diff --git a/irc/connection_throttling.go b/irc/connection_throttling.go
index 8dfd84f1..d26d34a2 100644
--- a/irc/connection_throttling.go
+++ b/irc/connection_throttling.go
@@ -8,7 +8,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 // ThrottleDetails holds the connection-throttling details for a subnet/IP.
diff --git a/irc/debug.go b/irc/debug.go
index 0021691a..4e523bf9 100644
--- a/irc/debug.go
+++ b/irc/debug.go
@@ -12,7 +12,7 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 // DEBUG GCSTATS/NUMGOROUTINE/etc
diff --git a/irc/dline.go b/irc/dline.go
index 670070c9..aaa16b87 100644
--- a/irc/dline.go
+++ b/irc/dline.go
@@ -14,8 +14,8 @@ import (
 
 	"encoding/json"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/custime"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
diff --git a/irc/help.go b/irc/help.go
index ef793c8a..b1006262 100644
--- a/irc/help.go
+++ b/irc/help.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 // HelpEntryType represents the different sorts of help entries that can exist.
diff --git a/irc/kline.go b/irc/kline.go
index 86344436..dcce4de6 100644
--- a/irc/kline.go
+++ b/irc/kline.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmatch"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmatch"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/custime"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
diff --git a/irc/message_tags.go b/irc/message_tags.go
index d00ceed3..1197b92f 100644
--- a/irc/message_tags.go
+++ b/irc/message_tags.go
@@ -3,7 +3,7 @@
 
 package irc
 
-import "github.com/DanielOaks/girc-go/ircmsg"
+import "github.com/goshuirc/irc-go/ircmsg"
 
 // GetClientOnlyTags takes a tag map and returns a map containing just the client-only tags from it.
 func GetClientOnlyTags(tags map[string]ircmsg.TagValue) *map[string]ircmsg.TagValue {
diff --git a/irc/modes.go b/irc/modes.go
index d124176e..00675132 100644
--- a/irc/modes.go
+++ b/irc/modes.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
 )
diff --git a/irc/monitor.go b/irc/monitor.go
index 8833c994..d7f750b8 100644
--- a/irc/monitor.go
+++ b/irc/monitor.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 // alertMonitors alerts everyone monitoring us that we're online.
diff --git a/irc/nickname.go b/irc/nickname.go
index f920422e..4978fc1e 100644
--- a/irc/nickname.go
+++ b/irc/nickname.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 var (
diff --git a/irc/nickserv.go b/irc/nickserv.go
index c38d9e78..21060b40 100644
--- a/irc/nickserv.go
+++ b/irc/nickserv.go
@@ -6,7 +6,7 @@ package irc
 import (
 	"strings"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 // nsHandler handles the /NS and /NICKSERV commands
diff --git a/irc/roleplay.go b/irc/roleplay.go
index 302dabf3..9a7663a6 100644
--- a/irc/roleplay.go
+++ b/irc/roleplay.go
@@ -6,7 +6,7 @@ package irc
 import (
 	"fmt"
 
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircmsg"
 )
 
 const (
diff --git a/irc/server.go b/irc/server.go
index 0da56eb0..85186d05 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -23,8 +23,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
-	"github.com/DanielOaks/girc-go/ircmsg"
+	"github.com/goshuirc/irc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircmsg"
 	"github.com/oragono/oragono/irc/logger"
 	"github.com/oragono/oragono/irc/sno"
 	"github.com/tidwall/buntdb"
diff --git a/irc/snomanager.go b/irc/snomanager.go
index 5eebb777..979e6c1d 100644
--- a/irc/snomanager.go
+++ b/irc/snomanager.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/DanielOaks/girc-go/ircfmt"
+	"github.com/goshuirc/irc-go/ircfmt"
 	"github.com/oragono/oragono/irc/sno"
 )