diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8fa870d..fa55907 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,6 +33,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-x64.yml'
 
+  # MacOS ARM 64-bit
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/osx-arm64.yml'
+
   ################################## CELLULAR ################################
   # Android
   - project: 'libretro-infrastructure/ci-templates'
@@ -120,6 +124,12 @@ libretro-build-osx-x64:
     - .libretro-osx-x64-make-default
     - .core-defs
 
+# MacOS ARM 64-bit
+libretro-build-osx-arm64:
+  extends:
+    - .libretro-osx-arm64-make-default
+    - .core-defs
+
 ################################### CELLULAR #################################
 # Android ARMv7a
 android-armeabi-v7a:
diff --git a/Makefile b/Makefile
index c6e6195..5cd92a7 100644
--- a/Makefile
+++ b/Makefile
@@ -61,13 +61,21 @@ else ifeq ($(platform),osx)
 	LIBS :=
 	OSXVER = `sw_vers -productVersion | cut -d. -f 2`
 	OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"`
-	fpic += -mmacosx-version-min=10.1
+	MINVERSION=
+   ifeq ($(OSX_LT_MAVERICKS),YES)
+   	MINVERSION += -mmacosx-version-min=10.1
+   else ifeq ($(shell uname -p),arm)
+	MINVERSION =
+   endif
 	ifndef ($(NOUNIVERSAL))
 		CFLAGS  += $(ARCHFLAGS)
 		CXXFLAGS  += $(ARCHFLAGS)
 		LDFLAGS += $(ARCHFLAGS)
+		MINVERSION=
 	endif
 
+        fpic += $(MINVERSION)
+
 # iOS
 else ifneq (,$(findstring ios,$(platform)))