diff --git a/vendor/github.com/huin/goupnp/LICENSE b/goupnp/LICENSE
similarity index 100%
rename from vendor/github.com/huin/goupnp/LICENSE
rename to goupnp/LICENSE
diff --git a/vendor/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go b/goupnp/dcps/internetgateway1/internetgateway1.go
similarity index 99%
rename from vendor/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go
rename to goupnp/dcps/internetgateway1/internetgateway1.go
index a14cfe2..b047b1e 100644
--- a/vendor/github.com/huin/goupnp/dcps/internetgateway1/internetgateway1.go
+++ b/goupnp/dcps/internetgateway1/internetgateway1.go
@@ -12,8 +12,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/huin/goupnp"
-	"github.com/huin/goupnp/soap"
+	"github.com/NebulousLabs/go-upnp/goupnp"
+	"github.com/NebulousLabs/go-upnp/goupnp/soap"
 )
 
 // Hack to avoid Go complaining if time isn't used.
diff --git a/vendor/github.com/huin/goupnp/device.go b/goupnp/device.go
similarity index 98%
rename from vendor/github.com/huin/goupnp/device.go
rename to goupnp/device.go
index e5b658b..9efc131 100644
--- a/vendor/github.com/huin/goupnp/device.go
+++ b/goupnp/device.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/huin/goupnp/scpd"
-	"github.com/huin/goupnp/soap"
+	"github.com/NebulousLabs/go-upnp/goupnp/scpd"
+	"github.com/NebulousLabs/go-upnp/goupnp/soap"
 )
 
 const (
diff --git a/vendor/github.com/huin/goupnp/goupnp.go b/goupnp/goupnp.go
similarity index 97%
rename from vendor/github.com/huin/goupnp/goupnp.go
rename to goupnp/goupnp.go
index 0b5e272..f02e492 100644
--- a/vendor/github.com/huin/goupnp/goupnp.go
+++ b/goupnp/goupnp.go
@@ -22,10 +22,10 @@ import (
 	"net/url"
 	"time"
 
-	"golang.org/x/net/html/charset"
+	"github.com/NebulousLabs/go-upnp/goupnp/httpu"
+	"github.com/NebulousLabs/go-upnp/goupnp/ssdp"
 
-	"github.com/huin/goupnp/httpu"
-	"github.com/huin/goupnp/ssdp"
+	"golang.org/x/net/html/charset"
 )
 
 // ContextError is an error that wraps an error with some context information.
diff --git a/vendor/github.com/huin/goupnp/httpu/httpu.go b/goupnp/httpu/httpu.go
similarity index 100%
rename from vendor/github.com/huin/goupnp/httpu/httpu.go
rename to goupnp/httpu/httpu.go
diff --git a/vendor/github.com/huin/goupnp/httpu/serve.go b/goupnp/httpu/serve.go
similarity index 100%
rename from vendor/github.com/huin/goupnp/httpu/serve.go
rename to goupnp/httpu/serve.go
diff --git a/vendor/github.com/huin/goupnp/scpd/scpd.go b/goupnp/scpd/scpd.go
similarity index 100%
rename from vendor/github.com/huin/goupnp/scpd/scpd.go
rename to goupnp/scpd/scpd.go
diff --git a/vendor/github.com/huin/goupnp/service_client.go b/goupnp/service_client.go
similarity index 98%
rename from vendor/github.com/huin/goupnp/service_client.go
rename to goupnp/service_client.go
index 261d4e1..2adbe32 100644
--- a/vendor/github.com/huin/goupnp/service_client.go
+++ b/goupnp/service_client.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/huin/goupnp/soap"
+	"github.com/NebulousLabs/go-upnp/goupnp/soap"
 )
 
 // ServiceClient is a SOAP client, root device and the service for the SOAP
diff --git a/vendor/github.com/huin/goupnp/soap/soap.go b/goupnp/soap/soap.go
similarity index 100%
rename from vendor/github.com/huin/goupnp/soap/soap.go
rename to goupnp/soap/soap.go
diff --git a/vendor/github.com/huin/goupnp/soap/types.go b/goupnp/soap/types.go
similarity index 100%
rename from vendor/github.com/huin/goupnp/soap/types.go
rename to goupnp/soap/types.go
diff --git a/vendor/github.com/huin/goupnp/ssdp/registry.go b/goupnp/ssdp/registry.go
similarity index 99%
rename from vendor/github.com/huin/goupnp/ssdp/registry.go
rename to goupnp/ssdp/registry.go
index 0d27392..5c1e724 100644
--- a/vendor/github.com/huin/goupnp/ssdp/registry.go
+++ b/goupnp/ssdp/registry.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/huin/goupnp/httpu"
+	"github.com/NebulousLabs/go-upnp/goupnp/httpu"
 )
 
 const (
diff --git a/vendor/github.com/huin/goupnp/ssdp/ssdp.go b/goupnp/ssdp/ssdp.go
similarity index 98%
rename from vendor/github.com/huin/goupnp/ssdp/ssdp.go
rename to goupnp/ssdp/ssdp.go
index 239a341..b31262c 100644
--- a/vendor/github.com/huin/goupnp/ssdp/ssdp.go
+++ b/goupnp/ssdp/ssdp.go
@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/huin/goupnp/httpu"
+	"github.com/NebulousLabs/go-upnp/goupnp/httpu"
 )
 
 const (
diff --git a/upnp.go b/upnp.go
index 7809a98..2ab13ea 100644
--- a/upnp.go
+++ b/upnp.go
@@ -33,8 +33,8 @@ import (
 	"time"
 
 	"github.com/NebulousLabs/fastrand"
-	"github.com/huin/goupnp"
-	"github.com/huin/goupnp/dcps/internetgateway1"
+	"github.com/NebulousLabs/go-upnp/goupnp"
+	"github.com/NebulousLabs/go-upnp/goupnp/dcps/internetgateway1"
 )
 
 // An IGD provides an interface to the most commonly used functions of an