diff --git a/code/game/q_shared.h b/code/game/q_shared.h
index c35c9117..d16bb1d1 100644
--- a/code/game/q_shared.h
+++ b/code/game/q_shared.h
@@ -260,6 +260,12 @@ static inline float LittleFloat (const float l) { return FloatSwap(&l); }
 #define	CPUSTRING	"linux-ppc64"
 #elif defined __powerpc__
 #define	CPUSTRING	"linux-ppc"
+#elif defined __s390__
+#define	CPUSTRING	"linux-s390"
+#elif defined __s390x__
+#define	CPUSTRING	"linux-s390x"
+#elif defined __ia64__
+#define	CPUSTRING	"linux-ia64"
 #else
 #define	CPUSTRING	"linux-other"
 #endif
diff --git a/code/splines/q_shared.h b/code/splines/q_shared.h
index 8f28622d..c554823b 100644
--- a/code/splines/q_shared.h
+++ b/code/splines/q_shared.h
@@ -206,6 +206,12 @@ void Sys_PumpEvents( void );
 #define	CPUSTRING	"linux-ppc64"
 #elif defined __powerpc__
 #define	CPUSTRING	"linux-ppc"
+#elif defined __s390__
+#define	CPUSTRING	"linux-s390"
+#elif defined __s390x__
+#define	CPUSTRING	"linux-s390x"
+#elif defined __ia64__
+#define	CPUSTRING	"linux-ia64"
 #else
 #define	CPUSTRING	"linux-other"
 #endif
diff --git a/code/unix/Makefile b/code/unix/Makefile
index 49b0ff68..399c65ee 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -106,11 +106,19 @@ ifeq ($(PLATFORM),linux)
   ifeq ($(ARCH),x86_64)
     LIB=lib64
   else
+  ifeq ($(ARCH),ppc64)
+    LIB=lib64
+  else
+  ifeq ($(ARCH),s390x)
+    LIB=lib64
+  else
   ifeq ($(ARCH),ppc)
     VM_PPC=vm_none
   endif
   endif
   endif
+  endif
+  endif
 
   # bk001205: no mo'  -I/usr/include/glide, no FX
   # bk001205: no mo'  -Dstricmp=strcasecmp, see q_shared.h
diff --git a/code/unix/unix_main.c b/code/unix/unix_main.c
index 107023dd..9e15e0eb 100644
--- a/code/unix/unix_main.c
+++ b/code/unix/unix_main.c
@@ -356,6 +356,12 @@ void Sys_Init(void)
   Cvar_Set( "arch", "linux ppc64" );
 #  elif defined __powerpc__
   Cvar_Set( "arch", "linux ppc" );
+#  elif defined __s390__
+  Cvar_Set( "arch", "linux s390" );
+#  elif defined __s390x__
+  Cvar_Set( "arch", "linux s390x" );
+#  elif defined __ia64__
+  Cvar_Set( "arch", "linux ia64" );
 #  elif defined __alpha__
   Cvar_Set( "arch", "linux alpha" );
 #  elif defined __sparc__
@@ -760,6 +766,12 @@ void *Sys_LoadDll( const char *name, char *fqpath ,
   snprintf (fname, sizeof(fname), "%sppc64.so", name);
 #elif defined __powerpc__   //rcg010207 - PPC support.
   snprintf (fname, sizeof(fname), "%sppc.so", name);
+#elif defined __s390__
+  snprintf (fname, sizeof(fname), "%ss390.so", name);
+#elif defined __s390x__
+  snprintf (fname, sizeof(fname), "%ss390x.so", name);
+#elif defined __ia64__
+  snprintf (fname, sizeof(fname), "%sia64.so", name);
 #elif defined __axp__
   snprintf (fname, sizeof(fname), "%saxp.so", name);
 #elif defined __mips__