diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dad9c05..464dea2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,3 +125,17 @@ jobs:
       with:
         name: arcem-${{ matrix.amiga.host }}
         path: ./arcem
+
+  build-nds:
+    name: Nintendo DS
+    runs-on: ubuntu-latest
+    container: devkitpro/devkitarm:latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: make SYSTEM=nds
+    - uses: actions/upload-artifact@v3
+      with:
+        name: arcem-nds
+        path: ./ArcEm.nds
diff --git a/Makefile b/Makefile
index 99090b0..eea6ef7 100644
--- a/Makefile
+++ b/Makefile
@@ -176,8 +176,8 @@ riscpkg: $(TARGET)
 endif
 
 ifeq (${SYSTEM},nds)
-CC=arm-none-eabi-gcc
-AS=arm-none-eabi-as
+CC=$(DEVKITARM)/bin/arm-none-eabi-gcc
+AS=$(DEVKITARM)/bin/arm-none-eabi-as
 LD=$(CC)
 ARM9_ARCH = -mthumb -mthumb-interwork -march=armv5te -mtune=arm946e-s
 CFLAGS += $(ARM9_ARCH) -ffunction-sections -fdata-sections -DSYSTEM_nds -DARM9 -DUSE_FAKEMAIN -DNO_OPEN64 -isystem $(DEVKITPRO)/libnds/include -Wno-cast-align -Wno-format