diff --git a/Makefile b/Makefile
index 3d6e6acd3..465c216cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
 LDFLAGS := $(shell go run buildscripts/gen-ldflags.go)
-DOCKER_BIN := $(shell which docker)
 PWD := $(shell pwd)
 GOPATH := $(shell go env GOPATH)
-DOCKER_LDFLAGS := '$(LDFLAGS) -extldflags "-static"'
 BUILD_LDFLAGS := '$(LDFLAGS)'
 TAG := latest
 
@@ -62,10 +60,6 @@ checks:
 	@(env bash $(PWD)/buildscripts/checkdeps.sh)
 	@(env bash $(PWD)/buildscripts/checkgopath.sh)
 
-checkdocker:
-	@echo "Checking if docker is installed.. "
-	@if [ -z ${DOCKER_BIN} ]; then echo "Docker not installed, cannot build docker image. Please install 'sudo apt-get install docker.io'" && exit 1; else echo "Docker installed at ${DOCKER_BIN}."; fi;
-
 getdeps: checks
 	@go get -u github.com/golang/lint/golint && echo "Installed golint:"
 	@go get -u github.com/fzipp/gocyclo && echo "Installed gocyclo:"
@@ -133,13 +127,6 @@ pkg-list:
 
 install: gomake-all
 
-dockerimage: checkdocker getdeps verifiers $(UI_ASSETS)
-	@echo "Building docker image:" minio:$(TAG)
-	@GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=amd64 go build --ldflags $(DOCKER_LDFLAGS) -o docker/minio.dockerimage
-	@cd docker; mkdir -p export; sudo docker build --rm --tag=minio/minio:$(TAG) .
-	@rmdir docker/export
-	@rm docker/minio.dockerimage
-
 release: verifiers
 	@MINIO_RELEASE=RELEASE ./buildscripts/build.sh
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index c575e8d7d..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# use "make dockerimage" to build
-FROM alpine:3.3
-RUN apk add --no-cache ca-certificates bash
-ADD minio.dockerimage /minio
-ADD export /export
-EXPOSE 9000
-COPY start.sh /start.sh
-ENV ALLOW_CONTAINER_ROOT=1
-ENTRYPOINT ["/start.sh"]
-CMD ["/export"]
diff --git a/docker/start.sh b/docker/start.sh
deleted file mode 100755
index bfc727b88..000000000
--- a/docker/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-## Fix this check when we arrive at XL.
-if [ -z "$1" ]; then
-    echo "Invalid arguments"
-    echo "Usage: <export_dir>"
-    exit 1
-else
-    /bin/mkdir -p "$1" && /minio server "$1"
-fi