diff --git a/build.go b/build.go
index 4486cd3deb9..7fc9ad0d103 100644
--- a/build.go
+++ b/build.go
@@ -165,6 +165,7 @@ func makeLatestDistCopies() {
 		".x86_64.rpm":         "dist/grafana-latest-1.x86_64.rpm",
 		".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
 		".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz",
+		".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz",
 		".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz",
 	}
 
@@ -239,6 +240,8 @@ func createDebPackages() {
 	previousPkgArch := pkgArch
 	if pkgArch == "armv7" {
 		pkgArch = "armhf"
+	} else if pkgArch == "armv6" {
+		pkgArch = "armel"
 	}
 	createPackage(linuxPackageOptions{
 		packageType:            "deb",
diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh
index dd69f8139c8..ab4be0dab3f 100755
--- a/scripts/build/build-all.sh
+++ b/scripts/build/build-all.sh
@@ -32,10 +32,12 @@ echo "Build arguments: $OPT"
 
 # build only amd64 for enterprise
 if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
+go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
   go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
   go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
   go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build
 fi
+
 go run build.go -goos windows -cc ${CCWIN64} ${OPT} build
 
 # Do not remove CC from the linux build, its there for compatibility with Centos6
@@ -67,6 +69,7 @@ rm tools/phantomjs/phantomjs
 
 # build only amd64 for enterprise
 if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
+  go run build.go -goos linux -pkg-arch armv6 ${OPT} package-only
   go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
   go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
 
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index ac6aab0b867..a1696ac01bd 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -28,6 +28,7 @@ fi
 
 echo "Build arguments: $OPT"
 
+go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
 go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
 go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
 
@@ -49,6 +50,7 @@ source /etc/profile.d/rvm.sh
 
 echo "Packaging"
 go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only
+go run build.go -goos linux -pkg-arch armv6 ${OPT} package-only
 go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
 go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only