diff --git a/Makefile b/Makefile
index 59e8444f3..9e1716d44 100644
--- a/Makefile
+++ b/Makefile
@@ -126,6 +126,18 @@ ifeq ($(HOST_OS),Darwin)
   endif
 endif
 
+ifeq ($(HOST_OS),Linux)
+  machine = $(shell sh -c 'uname -m 2>/dev/null || echo unknown')
+  ifneq (,$(findstring aarch64,$(machine)))
+    #Raspberry Pi 4-5
+    TARGET_RPI = 1
+  endif
+  ifneq (,$(findstring arm,$(machine)))
+    #Rasberry Pi zero, 2, 3, etc
+    TARGET_RPI = 1
+  endif
+endif
+
 # MXE overrides
 
 ifeq ($(WINDOWS_BUILD),1)
@@ -272,8 +284,6 @@ endif
 ifeq ($(TARGET_RPI),1)
   $(info Compiling for Raspberry Pi)
   DISCORD_SDK := 0
-  COOPNET := 0
-	machine = $(shell sh -c 'uname -m 2>/dev/null || echo unknown')
 
     # Raspberry Pi B+, Zero, etc
 	ifneq (,$(findstring armv6l,$(machine)))
@@ -966,9 +976,9 @@ ifeq ($(COOPNET),1)
     endif
   else ifeq ($(TARGET_RPI),1)
     ifneq (,$(findstring aarch64,$(machine)))
-      LDFLAGS += -Llib/coopnet/linux -l:libcoopnet-arm64.a -l:libjuice.a
+      LDFLAGS += -Llib/coopnet/linux -l:libcoopnet-arm64.a -l:libjuice-arm64.a
     else
-      LDFLAGS += -Llib/coopnet/linux -l:libcoopnet-arm.a -l:libjuice.a
+      LDFLAGS += -Llib/coopnet/linux -l:libcoopnet-arm.a -l:libjuice-arm.a
     endif
   else
     LDFLAGS += -Llib/coopnet/linux -l:libcoopnet.a -l:libjuice.a
diff --git a/lib/coopnet/linux/libcoopnet-arm.a b/lib/coopnet/linux/libcoopnet-arm.a
new file mode 100644
index 000000000..aa64895ca
Binary files /dev/null and b/lib/coopnet/linux/libcoopnet-arm.a differ
diff --git a/lib/coopnet/linux/libcoopnet-arm64.a b/lib/coopnet/linux/libcoopnet-arm64.a
new file mode 100644
index 000000000..37cf815d1
Binary files /dev/null and b/lib/coopnet/linux/libcoopnet-arm64.a differ
diff --git a/lib/coopnet/linux/libjuice-arm.a b/lib/coopnet/linux/libjuice-arm.a
new file mode 100644
index 000000000..42d37f1c1
Binary files /dev/null and b/lib/coopnet/linux/libjuice-arm.a differ
diff --git a/lib/coopnet/linux/libjuice-arm64.a b/lib/coopnet/linux/libjuice-arm64.a
new file mode 100644
index 000000000..d49379be8
Binary files /dev/null and b/lib/coopnet/linux/libjuice-arm64.a differ