diff --git a/micro/Dockerfile b/micro/Dockerfile
index 7f3e7cf..fac1ab8 100644
--- a/micro/Dockerfile
+++ b/micro/Dockerfile
@@ -1,15 +1,28 @@
-FROM golang:1.7.0-alpine
+FROM alpine:edge
 MAINTAINER Christian Koep <christian.koep@fom-net.de>
 
-RUN apk update && apk add --no-cache \
-		git \
-		make \
-		&& rm -rf /var/lib/apt/lists/* \
-		&& git clone --depth 1 -b master https://github.com/zyedidia/micro /usr/src/micro \
-		&& cd /usr/src/micro \
-		&& make install \
-		&& apk del \
-			git \
-			make
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go
 
-ENTRYPOINT [ "/go/bin/micro" ]
+RUN buildDeps=' \
+		go \
+		git \
+		gcc \
+		g++ \
+		libc-dev \
+		libgcc \
+		make \
+	' \
+	set -x \
+	&& apk --no-cache add $buildDeps \
+	&& git clone --depth 1 -b master https://github.com/zyedidia/micro /usr/src/micro \
+	&& cd /usr/src/micro \
+	&& mkdir -p /go/bin \
+	&& make install \
+	&& mv /go/bin/micro /usr/bin/micro \
+	&& rm -rf /usr/src/micro \
+	&& apk del $buildDeps \
+	&& rm -rf /go \
+	&& echo "Build complete."
+
+ENTRYPOINT [ "micro" ]