diff --git a/peach_package_builder/build_yunohost_binaries.py b/peach_package_builder/build_yunohost_binaries.py
index 7698242..f5de119 100644
--- a/peach_package_builder/build_yunohost_binaries.py
+++ b/peach_package_builder/build_yunohost_binaries.py
@@ -25,10 +25,18 @@ def pull_go_repo():
 
 def crosscompile_go_sbot(architecture, binaries_dir):
     subprocess.check_call(["git", "pull"], cwd=GO_SSB_DIR)
+    if architecture == "arm7":
+        base_cmd = ["env", "CGO_ENABLED=1", "CC=arm-linux-gnueabi-gcc",
+                               "GOOS=linux",
+                               "GOARCH=arm", "GOARM=7", "go", "build"]
+    else:
+        base_cmd = ["env", "GOOS=linux", "GOARCH={}".format(architecture), "go", "build"]
     print("[CROSS-COMPILING sbotcli]")
-    subprocess.check_call(["env", "GOOS=linux", "GOARCH={}".format(architecture), "go", "build", "./cmd/sbotcli"], cwd=GO_SSB_DIR)
+    cmd = base_cmd + ["./cmd/sbotcli"]
+    subprocess.check_call(cmd, cwd=GO_SSB_DIR)
     print("[CROSS-COMPILING go-sbot]")
-    subprocess.check_call(["env", "GOOS=linux", "GOARCH={}".format(architecture), "go", "build", "./cmd/go-sbot"], cwd=GO_SSB_DIR)
+    cmd = base_cmd + ["./cmd/go-sbot"]
+    subprocess.check_call(cmd, cwd=GO_SSB_DIR)
     for binary in ["sbotcli", "go-sbot"]:
         binary_path = os.path.join(GO_SSB_DIR, binary)
         output_path = os.path.join(binaries_dir, binary)
@@ -85,6 +93,7 @@ if __name__ == '__main__':
     architectures = [
         ("aarch64-unknown-linux-gnu", "arm64", "aarch64"),
         ("x86_64-unknown-linux-gnu", "amd64", "amd64"),
+        ("armv7-unknown-linux-gnu", "arm7", "arm7"),
     ]
     for rust_architecture, go_architecture, yunohost_architecture in architectures:
         print("BUILDING WITH ARCHITECTURE {}, {}, {}".format(rust_architecture, go_architecture, yunohost_architecture))