diff --git a/agent.go b/agent.go
index 35dfb1b..2e41bcf 100644
--- a/agent.go
+++ b/agent.go
@@ -11,8 +11,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/gortc/stun"
 	"github.com/pion/logging"
+	"github.com/pion/stun"
 	"github.com/pion/transport/packetio"
 )
 
diff --git a/agent_test.go b/agent_test.go
index cadd911..62ef5ff 100644
--- a/agent_test.go
+++ b/agent_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gortc/stun"
 	"github.com/pion/logging"
+	"github.com/pion/stun"
 	"github.com/pion/transport/test"
 )
 
diff --git a/candidate.go b/candidate.go
index b9b544c..bf9ff37 100644
--- a/candidate.go
+++ b/candidate.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 const (
diff --git a/candidatepair.go b/candidatepair.go
index 520d811..6f5ac72 100644
--- a/candidatepair.go
+++ b/candidatepair.go
@@ -3,7 +3,7 @@ package ice
 import (
 	"fmt"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 func newCandidatePair(local, remote *Candidate, controlling bool) *candidatePair {
diff --git a/gather.go b/gather.go
index 8db9078..b6c7b56 100644
--- a/gather.go
+++ b/gather.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 func localInterfaces(networkTypes []NetworkType) (ips []net.IP) {
diff --git a/go.mod b/go.mod
index 6829160..7c994dc 100644
--- a/go.mod
+++ b/go.mod
@@ -3,8 +3,8 @@ module github.com/pion/ice
 go 1.12
 
 require (
-	github.com/gortc/stun v1.19.0
 	github.com/pion/logging v0.2.1
+	github.com/pion/stun v0.2.3-0.20190521105836-be7bc5d4a230
 	github.com/pion/transport v0.7.0
 	github.com/stretchr/testify v1.3.0
 )
diff --git a/go.sum b/go.sum
index 82803d5..c909a6b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,13 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gortc/stun v1.19.0 h1:6qy7zGGk0tdMOdEzK7hLeAVZEHllJC8+OOBpPAyjY1c=
-github.com/gortc/stun v1.19.0/go.mod h1:dZ0O/fYCkg9Z0Pvl6WDpNhRFTAU0X1CPOsJiZqn6EHo=
 github.com/pion/logging v0.2.1 h1:LwASkBKZ+2ysGJ+jLv1E/9H1ge0k1nTfi1X+5zirkDk=
 github.com/pion/logging v0.2.1/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
+github.com/pion/stun v0.2.3-0.20190521105836-be7bc5d4a230 h1:UABEGI/irK/3t/Fz1yCBSY59JKVOYULfLP1GT24WS5U=
+github.com/pion/stun v0.2.3-0.20190521105836-be7bc5d4a230/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M=
 github.com/pion/transport v0.7.0 h1:EsXN8TglHMlKZMo4ZGqwK6QgXBu0WYg7wfGMWIXsS+w=
 github.com/pion/transport v0.7.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/icecontrol.go b/icecontrol.go
index 5d6f5a1..017d50e 100644
--- a/icecontrol.go
+++ b/icecontrol.go
@@ -1,6 +1,6 @@
 package ice
 
-import "github.com/gortc/stun"
+import "github.com/pion/stun"
 
 // tiebreaker is common helper for ICE-{CONTROLLED,CONTROLLING}
 // and represents the so-called tiebreaker number.
diff --git a/icecontrol_test.go b/icecontrol_test.go
index 314310b..9254c71 100644
--- a/icecontrol_test.go
+++ b/icecontrol_test.go
@@ -3,7 +3,7 @@ package ice
 import (
 	"testing"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 func TestControlled_GetFrom(t *testing.T) {
diff --git a/priority.go b/priority.go
index 2756d9b..727c550 100644
--- a/priority.go
+++ b/priority.go
@@ -1,6 +1,6 @@
 package ice
 
-import "github.com/gortc/stun"
+import "github.com/pion/stun"
 
 // PriorityAttr represents PRIORITY attribute.
 type PriorityAttr uint32
diff --git a/priority_test.go b/priority_test.go
index 8cfa67f..6930d8a 100644
--- a/priority_test.go
+++ b/priority_test.go
@@ -3,7 +3,7 @@ package ice
 import (
 	"testing"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 func TestPriority_GetFrom(t *testing.T) {
diff --git a/selection.go b/selection.go
index e1f08b6..182237e 100644
--- a/selection.go
+++ b/selection.go
@@ -3,8 +3,8 @@ package ice
 import (
 	"net"
 
-	"github.com/gortc/stun"
 	"github.com/pion/logging"
+	"github.com/pion/stun"
 )
 
 type pairCandidateSelector interface {
diff --git a/stun.go b/stun.go
index 024aac0..6a3315c 100644
--- a/stun.go
+++ b/stun.go
@@ -4,7 +4,7 @@ import (
 	"encoding/binary"
 	"fmt"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 // bin is shorthand for BigEndian.
diff --git a/transport.go b/transport.go
index 0dcd89a..f295220 100644
--- a/transport.go
+++ b/transport.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 // Dial connects to the remote agent, acting as the controlling ice agent.
diff --git a/usecandidate.go b/usecandidate.go
index c9856c7..21aa374 100644
--- a/usecandidate.go
+++ b/usecandidate.go
@@ -1,6 +1,6 @@
 package ice
 
-import "github.com/gortc/stun"
+import "github.com/pion/stun"
 
 // UseCandidateAttr represents USE-CANDIDATE attribute.
 type UseCandidateAttr struct{}
diff --git a/usecandidate_test.go b/usecandidate_test.go
index a5168c4..8d8406a 100644
--- a/usecandidate_test.go
+++ b/usecandidate_test.go
@@ -3,7 +3,7 @@ package ice
 import (
 	"testing"
 
-	"github.com/gortc/stun"
+	"github.com/pion/stun"
 )
 
 func TestUseCandidateAttr_AddTo(t *testing.T) {