diff --git a/makefile b/makefile
index e0cd718..fe97564 100644
--- a/makefile
+++ b/makefile
@@ -2,6 +2,8 @@ VERSION=2.4
 GITHASH=$(shell git rev-parse --short=8 HEAD)
 
 GO_LDFLAGS = -s -w -X 'main.Version=$(VERSION)' -X 'main.GitHash=$(GITHASH)'
+CC_ARM    ?= arm-linux-gnueabihf-gcc
+CC_ARM64  ?= aarch64-linux-gnu-gcc
 
 export GOARCH      ?= amd64
 export CGO_ENABLED  = 1
@@ -20,6 +22,20 @@ build_linux:
 	mkdir -p _output/linux
 	GOOS=linux go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr ./cmd/yarr
 
+build_linux_arm:
+	mkdir -p _output/linux_arm
+	CC=$(CC_ARM) \
+	GOOS=linux \
+	GOARCH=arm GOARM=7 \
+	go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux_arm/yarr ./cmd/yarr
+
+build_linux_arm64:
+	mkdir -p _output/linux_arm64
+	CC=$(CC_ARM64) \
+	GOOS=linux \
+	GOARCH=arm64 \
+	go build -tags "sqlite_foreign_keys linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux_arm64/yarr ./cmd/yarr
+
 build_windows:
 	mkdir -p _output/windows
 	go run ./cmd/generate_versioninfo -version "$(VERSION)" -outfile src/platform/versioninfo.rc