diff --git a/build-config.sh b/build-config.sh
index 6b943a38..8b6b8281 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -186,6 +186,7 @@ include_core_3dengine
 include_core_2048
 include_core_stonesoup
 include_core_scummvm
+include_core_chaigame
 
 # --- Miscellaneous cores ---
 include_core_video_processor
diff --git a/dist/info/chaigame_libretro.info b/dist/info/chaigame_libretro.info
new file mode 100644
index 00000000..df2107d0
--- /dev/null
+++ b/dist/info/chaigame_libretro.info
@@ -0,0 +1,11 @@
+display_name = "ChaiGame"
+authors = "Rob Loach"
+supported_extensions = "chai|chaigame"
+corename = "ChaiGame"
+categories = "Game engine"
+systemname = "ChaiGame"
+database = "ChaiGame"
+license = "MIT"
+permissions = ""
+display_version = "0.1.0"
+supports_no_game = "false"
diff --git a/libretro-build-database.sh b/libretro-build-database.sh
index 784acd1c..6c77ea13 100755
--- a/libretro-build-database.sh
+++ b/libretro-build-database.sh
@@ -212,6 +212,7 @@ build_libretro_databases() {
 	build_libretro_database "ScummVM" "rom.crc"
 	build_libretro_database "DOS" "rom.crc"
 	build_libretro_database "Lutro" "rom.name"
+	build_libretro_database "ChaiGame" "rom.crc"
 	build_libretro_database "Nintendo - Super Nintendo Entertainment System" "rom.crc"
 	build_libretro_database "Sony - PlayStation" "rom.serial"
 	build_libretro_database "Atari - Jaguar" "rom.crc"
diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic
index 1124e5ff..f9af23f3 100644
--- a/recipes/linux/cores-linux-armhf-generic
+++ b/recipes/linux/cores-linux-armhf-generic
@@ -11,6 +11,7 @@ bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.g
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git master PROJECT YES BSNES Makefile . performance 
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master PROJECT YES GENERIC Makefile .
+chaigame libretro-chaigame https://github.com/RobLoach/ChaiGame.git master PROJECT YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master PROJECT YES GENERIC Makefile.libretro desmume platform=armv7-neon-hardfloat 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master PROJECT YES GENERIC Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master PROJECT YES GENERIC Makefile.libretro . 
diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic
index b770caad..5673bf0c 100644
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-generic
@@ -14,6 +14,7 @@ citra libretro-citra https://github.com/libretro/citra.git master SUBMODULE YES
 craft libretro-craft https://github.com/libretro/craft master PROJECT YES GENERIC Makefile.libretro . 
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master SUBMODULE YES GENERIC Makefile . 
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master PROJECT YES GENERIC Makefile .
+chaigame libretro-chaigame https://github.com/RobLoach/ChaiGame.git master PROJECT YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master PROJECT YES GENERIC Makefile . 
 dolphin libretro-dolphin https://github.com/libretro/dolphin.git master PROJECT YES GENERIC Makefile Source/Core/DolphinLibretro/ 
diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic
index b5025843..3a024968 100644
--- a/recipes/linux/cores-linux-x86-generic
+++ b/recipes/linux/cores-linux-x86-generic
@@ -13,6 +13,7 @@ bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.g
 craft libretro-craft https://github.com/libretro/craft master PROJECT YES GENERIC Makefile.libretro . 
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master SUBMODULE YES GENERIC Makefile . 
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master PROJECT YES GENERIC Makefile .
+chaigame libretro-chaigame https://github.com/RobLoach/ChaiGame.git master PROJECT YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git master PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git master PROJECT YES GENERIC Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git master PROJECT YES GENERIC Makefile.libretro . 
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index 97f43126..b3c65d37 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -767,6 +767,14 @@ libretro_gw_git_url="https://github.com/libretro/gw-libretro.git"
 libretro_gw_git_submodules="yes"
 libretro_gw_build_makefile="Makefile.libretro"
 
+include_core_chaigame() {
+	register_module core "chaigame" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
+}
+libretro_chaigame_name="ChaiGame"
+libretro_chaigame_git_url="https://github.com/RobLoach/ChaiGame.git"
+libretro_chaigame_git_submodules="yes"
+libretro_chaigame_build_makefile="Makefile"
+
 include_core_81() {
 	register_module core "81" -theos_ios -ngc -sncps3 -ps3 -psp1 -qnx -wii
 }