diff --git a/Dockerfile b/Dockerfile
index 711eb1a..2b174ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM google/golang
 
+RUN cd /goroot/src/ && GOOS=linux GOARCH=386 ./make.bash --no-clean
+
 WORKDIR /gopath/src/gor
 
 ADD . /gopath/src/gor
diff --git a/Makefile b/Makefile
index 99c0bb2..eca5ff6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,12 @@
 SOURCE = emitter.go gor.go gor_stat.go input_dummy.go input_file.go input_raw.go input_tcp.go limiter.go output_dummy.go output_file.go output_http.go output_tcp.go plugins.go settings.go settings_header_filters.go settings_header_hash_filters.go settings_headers.go settings_methods.go settings_option.go settings_url_regexp.go test_input.go elasticsearch.go settings_url_map.go
 
-all: build-x86 build-x64
+release: release-x86 release-x64
 
-build-x64:
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build
-	tar -czf gor_x64.tar.gz gor
-	rm gor
-
-build-x86:
-	GOOS=linux GOARCH=386 CGO_ENABLED=0 go build
-	tar -czf gor_x86.tar.gz gor
-	rm gor
+release-x64:
+	docker run -v `pwd`:/gopath/src/gor -t --env GOOS=linux --env GOARCH=amd64 --env CGO_ENABLED=0 -i gor go build && tar -czf gor_x64.tar.gz gor && rm gor
+	
+release-x86:
+	docker run -v `pwd`:/gopath/src/gor -t --env GOOS=linux --env GOARCH=386 --env CGO_ENABLED=0 -i gor go build && tar -czf gor_x86.tar.gz gor && rm gor
 
 dbuild:
 	docker build -t gor .