diff --git a/frontend/frontend.go b/frontend/frontend.go
index c2a103f..63569c3 100644
--- a/frontend/frontend.go
+++ b/frontend/frontend.go
@@ -1,7 +1,7 @@
 package frontend
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/chihaya/chihaya/bittorrent"
 )
diff --git a/frontend/http/frontend.go b/frontend/http/frontend.go
index 7439923..48cedf9 100644
--- a/frontend/http/frontend.go
+++ b/frontend/http/frontend.go
@@ -3,6 +3,7 @@
 package http
 
 import (
+	"context"
 	"net"
 	"net/http"
 	"time"
@@ -10,7 +11,6 @@ import (
 	"github.com/julienschmidt/httprouter"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tylerb/graceful"
-	"golang.org/x/net/context"
 
 	"github.com/chihaya/chihaya/frontend"
 )
diff --git a/frontend/udp/frontend.go b/frontend/udp/frontend.go
index a4474b3..fc65c72 100644
--- a/frontend/udp/frontend.go
+++ b/frontend/udp/frontend.go
@@ -4,6 +4,7 @@ package udp
 
 import (
 	"bytes"
+	"context"
 	"encoding/binary"
 	"log"
 	"net"
@@ -11,7 +12,6 @@ import (
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
-	"golang.org/x/net/context"
 
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/frontend"
diff --git a/middleware/hooks.go b/middleware/hooks.go
index 1c5b30f..7a6c5ae 100644
--- a/middleware/hooks.go
+++ b/middleware/hooks.go
@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/chihaya/chihaya/bittorrent"
 )
diff --git a/middleware/middleware.go b/middleware/middleware.go
index 6adf4a0..18cb64b 100644
--- a/middleware/middleware.go
+++ b/middleware/middleware.go
@@ -3,11 +3,10 @@
 package middleware
 
 import (
+	"context"
 	"log"
 	"time"
 
-	"golang.org/x/net/context"
-
 	"github.com/chihaya/chihaya/bittorrent"
 	"github.com/chihaya/chihaya/frontend"
 	"github.com/chihaya/chihaya/storage"