diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90341686..93575838 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-
+* Set GOARM separately for each architecture [Pablo]
+* Add armv5 (armel) build [Trong]
 * Add OOM protection for the supervisor container, openvpn and connmand [Praneeth]
 
 # v1.3.2
diff --git a/Makefile b/Makefile
index 99e0c887..0947a09e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,15 @@ MIXPANEL_TOKEN = bananasbananas
 
 ifeq ($(ARCH),rpi)
 	GOARCH = arm
+	GOARM = 6
 endif
 ifeq ($(ARCH),armv7hf)
 	GOARCH = arm
+	GOARM = 7
 endif
 ifeq ($(ARCH),armel)
 	GOARCH = arm
+	GOARM = 5
 endif
 ifeq ($(ARCH),i386)
 	GOARCH = 386
@@ -80,7 +83,7 @@ go-builder:
 gosuper: go-builder
 	-mkdir -p bin
 	-docker rm --volumes -f resin_build_gosuper_$(JOB_NAME) || true
-	docker run --name resin_build_gosuper_$(JOB_NAME) -v $(shell pwd)/gosuper/bin:/usr/src/app/bin -e USER_ID=$(shell id -u) -e GROUP_ID=$(shell id -g) -e GOARCH=$(GOARCH) resin/go-supervisor-builder:$(SUPERVISOR_VERSION)
+	docker run --name resin_build_gosuper_$(JOB_NAME) -v $(shell pwd)/gosuper/bin:/usr/src/app/bin -e USER_ID=$(shell id -u) -e GROUP_ID=$(shell id -g) -e GOARCH=$(GOARCH) -e GOARM=$(GOARM) resin/go-supervisor-builder:$(SUPERVISOR_VERSION)
 	docker rm --volumes -f resin_build_gosuper_$(JOB_NAME)
 	mv gosuper/bin/linux_$(GOARCH)/gosuper bin/gosuper
 
diff --git a/gosuper/Dockerfile b/gosuper/Dockerfile
index 5c034a92..7fbe55db 100644
--- a/gosuper/Dockerfile
+++ b/gosuper/Dockerfile
@@ -2,8 +2,6 @@ FROM golang:1.5.1
 
 ENV GOOS linux
 ENV GOPATH /usr/src/app
-# Set an explicit GOARM of 5 for maximum compatibility
-ENV GOARM 5
 
 WORKDIR /usr/src/app