diff --git a/Makefile b/Makefile
index a26fc79599..fef6878726 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,13 @@ ifeq ($(COMPILE_ARCH),axp)
   COMPILE_ARCH=alpha
 endif
 
+ifeq ($(COMPILE_ARCH),arm)
+  COMPILE_ARCH=aarch64
+endif
+ifeq ($(COMPILE_ARCH),arm64)
+  COMPILE_ARCH=aarch64
+endif
+
 ifndef ARCH
 ARCH=$(COMPILE_ARCH)
 endif
@@ -458,7 +465,9 @@ else # ifeq Linux
 #############################################################################
 
 ifeq ($(PLATFORM),darwin)
-  HAVE_VM_COMPILED=true
+  ifneq ($(findstring $(ARCH),x86 x86_64 ppc ppc64),)
+    HAVE_VM_COMPILED=true
+  endif
   LIBS = -framework Cocoa
   CLIENT_LIBS=
   RENDERER_LIBS=
@@ -482,6 +491,9 @@ ifeq ($(PLATFORM),darwin)
   ifeq ($(ARCH),x86_64)
     OPTIMIZEVM += -arch x86_64 -mfpmath=sse
   endif
+  ifeq ($(ARCH),aarch64)
+    OPTIMIZEVM += -arch arm64
+  endif
 
   # When compiling on OSX for OSX, we're not cross compiling as far as the
   # Makefile is concerned, as target architecture is specified as a compiler
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index e0c0ae06b3..35ab6c77ed 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2773,7 +2773,7 @@ void Com_Init( char *commandLine ) {
 	Sys_Init();
 
 	if( Sys_WritePIDFile( ) ) {
-#ifndef DEDICATED
+#if !defined(DEDICATED) && !defined(MACOS_X)
 		const char *message = "The last time " CLIENT_WINDOW_TITLE " ran, "
 			"it didn't exit properly. This may be due to inappropriate video "
 			"settings. Would you like to start with \"safe\" video settings?";
diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 674b0eff22..6617b4a92e 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -161,6 +161,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define idx64 1
 #define ARCH_STRING "x86_64"
 #define Q3_LITTLE_ENDIAN
+#elif defined __aarch64__
+#define ARCH_STRING "aarch64"
+#define Q3_LITTLE_ENDIAN
+#elif defined __arm__
+#define ARCH_STRING "arm"
+#define Q3_LITTLE_ENDIAN
 #endif
 
 #define DLL_EXT ".dylib"