diff --git a/dockerbuild/Dockerfile.alpine b/dockerbuild/Dockerfile.alpine
index 1610ce52e..04c298d15 100644
--- a/dockerbuild/Dockerfile.alpine
+++ b/dockerbuild/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.11.3
+FROM alpine:3.15
 
 ARG go_pkg_url
 
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
index e16d23f87..2d103d847 100644
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@@ -1079,7 +1079,8 @@ enum ZT_Architecture
 	ZT_ARCHITECTURE_DOTNET_CLR = 13,
 	ZT_ARCHITECTURE_JAVA_JVM = 14,
 	ZT_ARCHITECTURE_WEB = 15,
-	ZT_ARCHITECTURE_S390X = 16
+	ZT_ARCHITECTURE_S390X = 16,
+	ZT_ARCHITECTURE_LOONGARCH64 = 17
 };
 
 /**
diff --git a/make-linux.mk b/make-linux.mk
index cf30fbb0e..650ffa348 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -252,6 +252,10 @@ endif
 ifeq ($(CC_MACH),riscv64)
 	ZT_ARCHITECTURE=0
 endif
+ifeq ($(CC_MACH),loongarch64)
+	ZT_ARCHITECTURE=17
+	override DEFS+=-DZT_NO_TYPE_PUNNING
+endif
 
 # Fail if system architecture could not be determined
 ifeq ($(ZT_ARCHITECTURE),999)