diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
index 324036bd2..746009898 100644
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@@ -1096,7 +1096,8 @@ enum ZT_Architecture
 	ZT_ARCHITECTURE_SPARC64 = 12,
 	ZT_ARCHITECTURE_DOTNET_CLR = 13,
 	ZT_ARCHITECTURE_JAVA_JVM = 14,
-	ZT_ARCHITECTURE_WEB = 15
+	ZT_ARCHITECTURE_WEB = 15,
+	ZT_ARCHITECTURE_S390X = 16
 };
 
 /**
diff --git a/make-linux.mk b/make-linux.mk
index dc238c4f2..d0745fe9a 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -224,6 +224,9 @@ ifeq ($(CC_MACH),mips64el)
 	ZT_ARCHITECTURE=6
 	override DEFS+=-DZT_NO_TYPE_PUNNING
 endif
+ifeq ($(CC_MACH),s390x)
+	ZT_ARCHITECTURE=16
+endif
 
 # Fail if system architecture could not be determined
 ifeq ($(ZT_ARCHITECTURE),999)