diff --git a/.github/workflows/Build_MakeROM.yml b/.github/workflows/Build_MakeROM.yml
index 99e4880..144496b 100644
--- a/.github/workflows/Build_MakeROM.yml
+++ b/.github/workflows/Build_MakeROM.yml
@@ -15,28 +15,35 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        dist: [ubuntu_x86_64, macos_x86_64, win_x86_64]
+        dist: [ubuntu_x86_64, macos_x86_64, macos_arm64, win_x86_64]
         prog: [makerom]
         include:
-          - dist: win_x86_64
-            os: windows-latest
-            makeArgs: -j $env:NUMBER_OF_PROCESSORS
-            binExt: .exe
           - dist: ubuntu_x86_64
             os: ubuntu-latest
+            arch: x86_64
             makeArgs: -j$(nproc)
           - dist: macos_x86_64
             os: macos-latest
+            arch: x86_64
             makeArgs: -j$(sysctl -n hw.activecpu)
+          - dist: macos_x86_64
+            os: macos-latest
+            arch: arm64
+            makeArgs: -j$(sysctl -n hw.activecpu)
+           - dist: win_x86_64
+            os: windows-latest
+            arch: x86_64
+            makeArgs: -j $env:NUMBER_OF_PROCESSORS
+            binExt: .exe
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - name: Compile ${{ matrix.prog }}
         working-directory: ${{ matrix.prog }}
-        run: make PROJECT_PLATFORM_ARCH=${{ matrix.arch }} deps all
+        run: make ${{ matrix.makeArgs }} PROJECT_PLATFORM_ARCH=${{ matrix.arch }} deps all
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.prog }}-${{ matrix.dist }}
-          path: ./${{ matrix.prog }}/bin/${{ matrix.prog }}
+          path: ./${{ matrix.prog }}/bin/${{ matrix.prog }}${{ matrix.binExt }}
           if-no-files-found: error
diff --git a/makerom/makefile b/makerom/makefile
index 06dca86..2333865 100644
--- a/makerom/makefile
+++ b/makerom/makefile
@@ -74,6 +74,8 @@ ifeq ($(PROJECT_PLATFORM_ARCH),)
 		export PROJECT_PLATFORM_ARCH = $(shell uname -m)
 	else ifeq ($(PROJECT_PLATFORM), MACOS)
 		export PROJECT_PLATFORM_ARCH = $(shell uname -m)
+	else ifeq ($(PROJECT_PLATFORM), CYGWIN_NT)
+		export PROJECT_PLATFORM_ARCH = $(shell uname -m)
 	else
 		export PROJECT_PLATFORM_ARCH = x86_64
 	endif
@@ -89,15 +91,6 @@ ifeq ($(PROJECT_PLATFORM), WIN32)
 	INC +=
 	LIB += -static
 	ARFLAGS = cr -o
-else ifeq ($(PROJECT_PLATFORM), CYGWIN_NT)
-	# CygWin Flags/Libs
-	#CC = 
-	#CXX =
-	WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable
-	ARCHFLAGS =
-	INC +=
-	LIB += -liconv
-	ARFLAGS = cr -o
 else ifeq ($(PROJECT_PLATFORM), GNU)
 	# GNU/Linux Flags/Libs
 	#CC = 
@@ -116,6 +109,15 @@ else ifeq ($(PROJECT_PLATFORM), MACOS)
 	INC +=
 	LIB += -liconv
 	ARFLAGS = rc	
+else ifeq ($(PROJECT_PLATFORM), CYGWIN_NT)
+	# CygWin Flags/Libs
+	#CC = 
+	#CXX =
+	WARNFLAGS = -Wall -Wno-unused-value -Wno-unused-but-set-variable
+	ARCHFLAGS =
+	INC +=
+	LIB += -liconv
+	ARFLAGS = cr -o
 endif
 
 # Compiler Flags