diff --git a/Makefile b/Makefile
index 0009051..86a4913 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,7 @@
 default:	test
 
-setup:
-	GOPATH=`pwd`/.go go get -d -v .
-	GOPATH=`pwd`/.go go test -v -i
-	rm -f `pwd`/.go/src/tail
-	ln -sf `pwd` `pwd`/.go/src/tail
-
 test:	*.go
-	GOPATH=`pwd`/.go go test -v
+	go test -v
 
 fmt:
 	go fmt .
diff --git a/README.md b/README.md
index d2246d6..dd53a6e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,6 @@ for line := range t.Lines {
 
 To build and test the package,
 
-    make setup
     make test
 
 To build the command-line program `gotail`,
diff --git a/cmd/gotail/Makefile b/cmd/gotail/Makefile
index 54cda66..6b5a2d9 100644
--- a/cmd/gotail/Makefile
+++ b/cmd/gotail/Makefile
@@ -1,4 +1,4 @@
 default:	gotail
 
 gotail:	*.go ../../*.go
-	GOPATH=`pwd`/../../.go go build
+	go build