diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 719f8e4..05c68aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,10 @@ include:
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-arm64.yml'
 
+  # DJGPP
+  - project: 'libretro-infrastructure/ci-templates'
+    file: '/djgpp-static.yml'
+
   ################################## CELLULAR ################################
   # Android
   - project: 'libretro-infrastructure/ci-templates'
@@ -140,6 +144,12 @@ libretro-build-linux-i686:
     - .libretro-linux-i686-make-default
     - .core-defs
 
+# DJGPP
+libretro-build-djgpp-i586:
+  extends:
+    - .libretro-djgpp-static-retroarch-master
+    - .core-defs
+
 # MacOS 64-bit
 libretro-build-osx-x64:
   extends:
diff --git a/platform/LibRetro/Makefile b/platform/LibRetro/Makefile
index f724012..6c822b4 100644
--- a/platform/LibRetro/Makefile
+++ b/platform/LibRetro/Makefile
@@ -257,8 +257,9 @@ else ifeq ($(platform), vita)
 # DOS
 else ifeq ($(platform), dos)
 	TARGET := $(TARGET_NAME)_libretro_$(platform).a
-	CC = i686-pc-msdosdjgpp-gcc
-	AR = i686-pc-msdosdjgpp-ar
+	CC = i586-pc-msdosdjgpp-gcc
+	CXX = i586-pc-msdosdjgpp-g++
+	AR = i586-pc-msdosdjgpp-ar
 	CFLAGS += -march=i386
 	CXXFLAGS += -march=i386
 	STATIC_LINKING=1