diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..c7386b3
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Juan Batiz-Benet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0ab6e68
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+all: install
+
+godep:
+	go get github.com/tools/godep
+
+# saves/vendors third-party dependencies to Godeps/_workspace
+# -r flag rewrites import paths to use the vendored path
+# ./... performs operation on all packages in tree
+vendor: godep
+	godep save -r ./...
+
+install: dep
+	cd multiaddr && go install
+
+dep:
+	cd multiaddr && go get ./...
diff --git a/multiaddr/multiaddr.go b/multiaddr/multiaddr.go
index 3262ad5..d72c60c 100644
--- a/multiaddr/multiaddr.go
+++ b/multiaddr/multiaddr.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr/net"
+	manet "github.com/jbenet/go-multiaddr-net"
 )
 
 // flags