diff --git a/Makefile b/Makefile
index 954a4f2..d80ec37 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ build: ## Build sidecar binary for local target system
 	$(GO) build $(BUILD_OPTS) -v -i -o graylog-sidecar
 
 # does not include build-darwin as that only runs with homebrew on a Mac
-build-all: build-armhf build-linux build-linux32 build-windows build-windows32
+build-all: build-linux-armv7 build-linux build-linux32 build-windows build-windows32
 
 build-linux: ## Build sidecar binary for Linux
 	@mkdir -p build/$(COLLECTOR_VERSION)/linux/amd64
@@ -65,9 +65,9 @@ solaris-sigar-patch:
 		wget -O vendor/github.com/cloudfoundry/gosigar/sigar_solaris.go https://raw.githubusercontent.com/amitkris/gosigar/9fc0903125acd1a0dc7635f8670088339865bcd5/sigar_solaris.go; \
 	fi
 
-build-armhf: ## Build sidecar binary for armhf
-	@mkdir -p build/$(COLLECTOR_VERSION)/linux/armhf
-	GOOS=linux GOARCH=arm GOARM=7 $(GO) build $(BUILD_OPTS) -pkgdir $(GOPATH)/go_armhf  -v -i -o build/$(COLLECTOR_VERSION)/linux/armhf/graylog-sidecar
+build-linux-armv7: ## Build sidecar binary for linux-armv7
+	@mkdir -p build/$(COLLECTOR_VERSION)/linux/armv7
+	GOOS=linux GOARCH=arm GOARM=7 $(GO) build $(BUILD_OPTS) -pkgdir $(GOPATH)/go_linux-armv7  -v -i -o build/$(COLLECTOR_VERSION)/linux/armv7/graylog-sidecar
 
 build-solaris: solaris-sigar-patch ## Build sidecar binary for Solaris/OmniOS/Illumos
 	@mkdir -p build/$(COLLECTOR_VERSION)/solaris/amd64
@@ -93,24 +93,24 @@ build-windows32: ## Build sidecar binary for Windows 32bit
 	@mkdir -p build/$(COLLECTOR_VERSION)/windows/386
 	GOOS=windows GOARCH=386 CGO_ENABLED=1 CC=i686-w64-mingw32-gcc $(GO) build $(BUILD_OPTS) -pkgdir $(GOPATH)/go_win32 -v -i -o build/$(COLLECTOR_VERSION)/windows/386/graylog-sidecar.exe
 
-package-all: prepare-package package-armhf package-linux package-linux32 package-windows package-tar
+package-all: prepare-package package-linux-armv7 package-linux package-linux32 package-windows package-tar
 
 prepare-package:
 	@dist/fetch_collectors.sh
 
-package-armhf: ## Create Linux system package
-	@fpm-cook clean dist/recipearm.rb
+package-linux-armv7: ## Create Linux ARMv7 system package
+	@fpm-cook clean dist/recipearmv7.rb
 	@rm -rf dist/cache dist/tmp-build dist/tmp-dest
-	@fpm-cook -t deb package dist/recipearm.rb
-	@fpm-cook -t rpm package dist/recipearm.rb
+	@fpm-cook -t deb package dist/recipearmv7.rb
+	@fpm-cook -t rpm package dist/recipearmv7.rb
 
-package-linux: ## Create Linux system package
+package-linux: ## Create Linux amd64 system package
 	@fpm-cook clean dist/recipe.rb
 	@rm -rf dist/cache dist/tmp-build dist/tmp-dest
 	@fpm-cook -t deb package dist/recipe.rb
 	@fpm-cook -t rpm package dist/recipe.rb
 
-package-linux32: ## Create Linux system package for 32bit hosts
+package-linux32: ## Create Linux i386 system package
 	@fpm-cook clean dist/recipe32.rb
 	@rm -rf dist/cache dist/tmp-build dist/tmp-dest
 	@fpm-cook -t deb package dist/recipe32.rb
diff --git a/dist/recipearm.rb b/dist/recipearmv7.rb
similarity index 89%
rename from dist/recipearm.rb
rename to dist/recipearmv7.rb
index c1ebd57..225bf03 100644
--- a/dist/recipearm.rb
+++ b/dist/recipearmv7.rb
@@ -7,9 +7,9 @@ class GraylogSidecar < FPM::Cookery::Recipe
   version  data.version
   revision data.revision
   homepage 'https://graylog.org'
-  arch     'armhf'
+  arch     'armv7'
 
-  source   "file:../../build/#{version}/linux/armhf/graylog-sidecar"
+  source   "file:../../build/#{version}/linux/armv7/graylog-sidecar"
 
   maintainer 'Graylog, Inc. <hello@graylog.org>'
   vendor     'graylog'