diff --git a/Makefile b/Makefile
index b553eaa..2136238 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,12 @@
 export PATH := $(GOPATH)/bin:$(PATH)
-export OLDGOPATH := $(GOPATH)
-export GOPATH := $(shell pwd):$(GOPATH)
+export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH)
 
 all: build
 
-build: godep fmt frps frpc build_test
+build: fmt frps frpc build_test
 
 build_test: echo_server http_server
 
-godep:
-	GOPATH=$(OLDGOPATH) go get github.com/tools/godep
-
 fmt:
 	go fmt ./src/...
 	@go fmt ./test/echo_server.go
@@ -18,26 +14,26 @@ fmt:
 	@go fmt ./test/func_test.go
 
 frps:
-	godep go build -o bin/frps ./src/frp/cmd/frps
+	go build -o bin/frps ./src/frp/cmd/frps
 
 frpc:
-	godep go build -o bin/frpc ./src/frp/cmd/frpc
+	go build -o bin/frpc ./src/frp/cmd/frpc
 
 echo_server:
-	godep go build -o test/bin/echo_server ./test/echo_server.go
+	go build -o test/bin/echo_server ./test/echo_server.go
 
 http_server:
-	godep go build -o test/bin/http_server ./test/http_server.go
+	go build -o test/bin/http_server ./test/http_server.go
 
 test: gotest
 
 gotest:
-	godep go test -v ./src/...
+	go test -v ./src/...
 
 alltest:
 	cd ./test && ./run_test.sh && cd -
-	godep go test -v ./src/...
-	godep go test -v ./test/func_test.go
+	go test -v ./src/...
+	go test -v ./test/func_test.go
 	cd ./test && ./clean_test.sh && cd -
 
 clean:
diff --git a/Makefile.cross-compiles b/Makefile.cross-compiles
index 76c287a..5f47bb8 100644
--- a/Makefile.cross-compiles
+++ b/Makefile.cross-compiles
@@ -4,9 +4,9 @@ export GOPATH := $(shell pwd)/Godeps/_workspace:$(shell pwd):$(GOPATH)
 
 all: build
 
-build: godep app 
+build: gox app 
 
-godep:
+gox:
 	GOPATH=$(OLDGOPATH) go get github.com/mitchellh/gox
 
 app: