diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac64.yml
similarity index 96%
rename from .github/workflows/build_mac.yml
rename to .github/workflows/build_mac64.yml
index 1597f9d28..146c907fb 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac64.yml
@@ -25,7 +25,7 @@ jobs:
           MAC_ARM64_FLAGS:   "-fvisibility=hidden -rdynamic -DCC_BUILD_ICON -DCC_GFX_BACKEND=CC_GFX_BACKEND_GL2 -arch arm64"
           MAC_INTEL64_FLAGS: "-fvisibility=hidden -rdynamic -DCC_BUILD_ICON -arch x86_64"
         run: |
-          LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"           
+          LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"
           cd src
           
           MACOSX_DEPLOYMENT_TARGET=10.5 clang *.c Window_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC_INTEL64_FLAGS }} $LATEST_FLAG -o cc-mac64-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
diff --git a/.github/workflows/build_macclassic.yml b/.github/workflows/build_macclassic.yml
new file mode 100644
index 000000000..147bb1f92
--- /dev/null
+++ b/.github/workflows/build_macclassic.yml
@@ -0,0 +1,45 @@
+name: Build latest (Mac Classic)
+# trigger via either push to selected branches or on manual run
+on:
+  push:
+    branches:
+      - main
+      - master
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.ref }}-mac-classic
+  cancel-in-progress: true
+
+jobs:
+  build-mac-classic:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/autc04/retro68
+    steps:
+      - uses: actions/checkout@v4
+      - name: Compile Mac classic build
+        id: compile
+        run: |
+          make macclassic_68k RETRO68=/Retro68-build/toolchain
+          make macclassic_ppc RETRO68=/Retro68-build/toolchain
+
+
+      - uses: ./.github/actions/notify_failure
+        if: ${{ always() && steps.compile.outcome == 'failure' }}
+        with:
+          NOTIFY_MESSAGE: 'Failed to compile Mac Classic build'
+          WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}'
+
+
+      - uses: ./.github/actions/upload_build
+        if: ${{ always() && steps.compile.outcome == 'success' }}
+        with:
+          SOURCE_FILE: 'ClassiCube-68k.dsk'
+          DEST_NAME: 'ClassiCube-68k.dsk'
+
+      - uses: ./.github/actions/upload_build
+        if: ${{ always() && steps.compile.outcome == 'success' }}
+        with:
+          SOURCE_FILE: 'ClassiCube-ppc.dsk'
+          DEST_NAME: 'ClassiCube-ppc.dsk'
diff --git a/misc/macclassic/Makefile_68k b/misc/macclassic/Makefile_68k
index a960a2f54..9a838a54f 100644
--- a/misc/macclassic/Makefile_68k
+++ b/misc/macclassic/Makefile_68k
@@ -12,13 +12,13 @@ LDFLAGS=-lRetroConsole
 RINCLUDES=$(PREFIX)/RIncludes
 REZFLAGS=-I$(RINCLUDES)
 
-TARGET		:=	ClassiCube
-BUILD_DIR 	:=	build
+TARGET		:=	ClassiCube-68k
+BUILD_DIR 	:=	build-68k
 SOURCE_DIR	:=	src
 C_SOURCES   := $(wildcard $(SOURCE_DIR)/*.c)
 C_OBJECTS   := $(patsubst $(SOURCE_DIR)/%.c, $(BUILD_DIR)/%.o, $(C_SOURCES))
 
-$(TARGET).bin $(TARGET).APPL $(TARGET).dsk: $(TARGET).code.bin $(BUILD_DIR)
+$(TARGET).bin $(TARGET).APPL $(TARGET).dsk: $(BUILD_DIR) $(TARGET).code.bin
 	$(REZ) $(REZFLAGS) \
 		--copy "$(TARGET).code.bin" \
 		"misc/macclassic/68APPL.r" \
diff --git a/misc/macclassic/Makefile_ppc b/misc/macclassic/Makefile_ppc
index bfc3f5d47..1870b6af3 100644
--- a/misc/macclassic/Makefile_ppc
+++ b/misc/macclassic/Makefile_ppc
@@ -13,13 +13,13 @@ LDFLAGS=-lRetroConsole
 RINCLUDES=$(PREFIX)/RIncludes
 REZFLAGS=-I$(RINCLUDES)
 
-TARGET		:=	ClassiCube
-BUILD_DIR 	:=	build
+TARGET		:=	ClassiCube-ppc
+BUILD_DIR 	:=	build-ppc
 SOURCE_DIR	:=	src
 C_SOURCES   := $(wildcard $(SOURCE_DIR)/*.c)
 C_OBJECTS   := $(patsubst $(SOURCE_DIR)/%.c, $(BUILD_DIR)/%.o, $(C_SOURCES))
 
-$(TARGET).bin $(TARGET).APPL $(TARGET).dsk: $(TARGET).pef $(BUILD_DIR)
+$(TARGET).bin $(TARGET).APPL $(TARGET).dsk: $(BUILD_DIR) $(TARGET).pef
 	$(REZ) $(REZFLAGS) \
 		"misc/macclassic/ppcAPPL.r" \
 		-t "APPL" -c "????" \
diff --git a/src/Graphics_GL1.c b/src/Graphics_GL1.c
index 7734d28d4..26beeb8cb 100644
--- a/src/Graphics_GL1.c
+++ b/src/Graphics_GL1.c
@@ -738,7 +738,6 @@ static void FallbackOpenGL(void) {
 
 	_glDrawElements    = gl11_drawElements;    _glColorPointer  = gl11_colorPointer;
 	_glTexCoordPointer = gl11_texCoordPointer; _glVertexPointer = gl11_vertexPointer;
-	_realDrawElements = NULL;
 
 	/* OpenGL 1.0 fallback support */
 	if (_realDrawElements) return;