diff --git a/build.sh b/build.sh
index 5be8d56..8087436 100755
--- a/build.sh
+++ b/build.sh
@@ -413,6 +413,20 @@ for row in $(jq -r '.[] | @base64' ../cores.json); do
             cp EmulatorJS/data/cores/$name-thread-legacy-wasm.data $outputPath
         fi
 
+        # blueMSX requires Machines/ and Databases/ at runtime. The C-BIOS
+        # variants in these directories use freely redistributable ROMs so
+        # they can be packaged directly into the core archive.
+        if [ "$name" = "bluemsx" ]; then
+            echo "Adding system files (Machines + Databases) to bluemsx core archives..."
+            cd "$compileStartPath/$name/system/bluemsx"
+            for datafile in "$compileStartPath/EmulatorJS/data/cores/bluemsx"*.data; do
+                if [ -f "$datafile" ]; then
+                    7z a -t7z "$datafile" ./Machines ./Databases
+                fi
+            done
+            cd "$compileStartPath"
+        fi
+
         # create zip file containing the core data files
         cd EmulatorJS/data/cores
         zip $outputPath/$name.zip $name-thread*wasm.data
diff --git a/cores.json b/cores.json
index c35de05..9c6319b 100644
--- a/cores.json
+++ b/cores.json
@@ -1255,5 +1255,44 @@
         },
         "license": "license.txt",
         "repo": "https://github.com/EmulatorJS/azahar"
+    },
+    {
+        "name": "bluemsx",
+        "extensions": [
+            "rom", "ri", "mx1", "mx2", "dsk", "col",
+            "sg", "sc", "sf", "cas", "m3u"
+        ],
+        "makeoptions": {
+            "buildpath": "./",
+            "makescript": "Makefile.libretro",
+            "arguments": [],
+            "initialmemory": 67108864
+        },
+        "options": {
+            "supportsMouse": true,
+            "useKeyboard": true
+        },
+        "save": "srm",
+        "license": "license.txt",
+        "repo": "https://github.com/EmulatorJS/blueMSX-libretro"
+    },
+    {
+        "name": "flycast",
+        "extensions": [
+            "chd", "cdi", "gdi", "cue", "bin",
+            "lst", "dat", "elf", "zip", "7z", "m3u"
+        ],
+        "makeoptions": {
+            "buildpath": "./",
+            "makescript": "Makefile",
+            "arguments": []
+        },
+        "options": {
+            "supportsMouse": false,
+            "useKeyboard": false
+        },
+        "save": "srm",
+        "license": "LICENSE",
+        "repo": "https://github.com/EmulatorJS/flycast"
     }
 ]
\ No newline at end of file