diff --git a/appservice/consumers/roomserver.go b/appservice/consumers/roomserver.go
index dbdae5320..3f6c7fbee 100644
--- a/appservice/consumers/roomserver.go
+++ b/appservice/consumers/roomserver.go
@@ -27,7 +27,7 @@ import (
 	"github.com/matrix-org/gomatrixserverlib"
 
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.
diff --git a/clientapi/consumers/roomserver.go b/clientapi/consumers/roomserver.go
index 0ee7c6bf0..6b5fd6a7a 100644
--- a/clientapi/consumers/roomserver.go
+++ b/clientapi/consumers/roomserver.go
@@ -25,7 +25,7 @@ import (
 	"github.com/matrix-org/gomatrixserverlib"
 
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.
diff --git a/clientapi/producers/syncapi.go b/clientapi/producers/syncapi.go
index 6bfcd51aa..25732fc26 100644
--- a/clientapi/producers/syncapi.go
+++ b/clientapi/producers/syncapi.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/matrix-org/dendrite/common"
 
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // SyncAPIProducer produces events for the sync API server to consume
diff --git a/clientapi/producers/userupdate.go b/clientapi/producers/userupdate.go
index 2a5dfc70a..155b95c8b 100644
--- a/clientapi/producers/userupdate.go
+++ b/clientapi/producers/userupdate.go
@@ -17,7 +17,7 @@ package producers
 import (
 	"encoding/json"
 
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // UserUpdateProducer produces events related to user updates.
diff --git a/common/basecomponent/base.go b/common/basecomponent/base.go
index b05ec42db..1998aa93c 100644
--- a/common/basecomponent/base.go
+++ b/common/basecomponent/base.go
@@ -28,7 +28,7 @@ import (
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/gorilla/mux"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 
 	appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
 	"github.com/matrix-org/dendrite/common/config"
diff --git a/common/consumers.go b/common/consumers.go
index 2e58a6241..307ad48f6 100644
--- a/common/consumers.go
+++ b/common/consumers.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // A PartitionOffset is the offset into a partition of the input log.
diff --git a/go.mod b/go.mod
index d51f0a33e..4eedbbbac 100644
--- a/go.mod
+++ b/go.mod
@@ -65,3 +65,5 @@ require (
 	gopkg.in/macaroon.v2 v2.1.0
 	gopkg.in/yaml.v2 v2.2.2
 )
+
+go 1.13
diff --git a/publicroomsapi/consumers/roomserver.go b/publicroomsapi/consumers/roomserver.go
index b7d42b111..79c33378e 100644
--- a/publicroomsapi/consumers/roomserver.go
+++ b/publicroomsapi/consumers/roomserver.go
@@ -23,7 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/publicroomsapi/storage"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.
diff --git a/roomserver/input/input.go b/roomserver/input/input.go
index bd029d8df..f7c047491 100644
--- a/roomserver/input/input.go
+++ b/roomserver/input/input.go
@@ -24,7 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/util"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // RoomserverInputAPI implements api.RoomserverInputAPI
diff --git a/syncapi/consumers/clientapi.go b/syncapi/consumers/clientapi.go
index f0db56427..b16db987e 100644
--- a/syncapi/consumers/clientapi.go
+++ b/syncapi/consumers/clientapi.go
@@ -24,7 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/sync"
 	"github.com/matrix-org/dendrite/syncapi/types"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputClientDataConsumer consumes events that originated in the client API server.
diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index e4f1ab460..6600d5ea3 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -27,7 +27,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.
diff --git a/syncapi/consumers/typingserver.go b/syncapi/consumers/typingserver.go
index 5d998a18a..6d2fd33a7 100644
--- a/syncapi/consumers/typingserver.go
+++ b/syncapi/consumers/typingserver.go
@@ -24,7 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/dendrite/typingserver/api"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputTypingEventConsumer consumes events that originated in the typing server.
diff --git a/typingserver/input/input.go b/typingserver/input/input.go
index 0e2fbe51f..265e8591e 100644
--- a/typingserver/input/input.go
+++ b/typingserver/input/input.go
@@ -23,7 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/typingserver/cache"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
-	"gopkg.in/Shopify/sarama.v1"
+	"github.com/Shopify/sarama"
 )
 
 // TypingServerInputAPI implements api.TypingServerInputAPI