diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a3c388c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "goconfig"]
+	path = goconfig
+	url = https://github.com/raylu/goconfig.git
diff --git a/auth.go b/auth.go
index 6f8bb4c..12ebe93 100644
--- a/auth.go
+++ b/auth.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"strings"
 	irc "github.com/fluffle/goirc/client"
-	"github.com/kless/goconfig/config"
+	"goconfig"
 )
 
 const authFile = "auth.conf"
diff --git a/goconfig b/goconfig
new file mode 160000
index 0000000..61de17d
--- /dev/null
+++ b/goconfig
@@ -0,0 +1 @@
+Subproject commit 61de17d7ee327208dbf1f98cacf70fd14930a493
diff --git a/rbot.go b/rbot.go
index d3bad02..93267aa 100644
--- a/rbot.go
+++ b/rbot.go
@@ -8,7 +8,7 @@ import (
 	"time"
 	"crypto/tls"
 	"crypto/rand"
-	"github.com/kless/goconfig/config"
+	"goconfig"
 )
 
 const confFile = "rbot.conf"