diff --git a/build-config.sh b/build-config.sh
index 80ec239f..6ca35d19 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -48,6 +48,9 @@ include_core_fbalpha2012_cps1
 include_core_fbalpha2012_cps2
 include_core_fbalpha2012_neogeo
 
+# --- Neo Geo cores ---
+include_core_neocd
+
 # --- GBA emulator cores ---
 include_core_vba_next
 include_core_vbam
diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic
index f430321c..12ea1e3f 100644
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-generic
@@ -89,7 +89,7 @@ np2kai libretro-np2kai https://github.com/libretro/NP2kai.git master YES GENERIC
 nxengine libretro-nxengine https://github.com/libretro/nxengine-libretro.git master YES GENERIC Makefile .
 o2em libretro-o2em https://github.com/libretro/libretro-o2em.git master YES GENERIC Makefile .
 openlara libretro-openlara https://github.com/libretro/OpenLara.git master YES GENERIC Makefile src/platform/libretro
-parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64
+parallel_n64 libretro-parallel_n64 https://github.com/libretro/parallel-n64.git master YES GENERIC_GL Makefile . WITH_DYNAREC=x86_64 HAVE_PARALLEL_RSP=1 WANT_LLVM_OVERRIDE=1 LLVM_VERSION=8 HAVE_THR_AL=1
 pcsx_rearmed libretro-pcsx_rearmed https://github.com/libretro/pcsx_rearmed.git master YES GENERIC Makefile.libretro . USE_DYNAREC=0
 play libretro-play https://github.com/jpd002/Play-.git master YES CMAKE Makefile build -DBUILD_LIBRETRO_CORE=yes -DBUILD_PLAY=off -DBUILD_TESTS=no -DENABLE_AMAZON_S3=no -DCMAKE_BUILD_TYPE="Release" --target play_libretro
 picodrive libretro-picodrive https://github.com/libretro/picodrive.git master YES GENERIC Makefile.libretro .
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index 80077308..2108171b 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -780,6 +780,14 @@ libretro_bsnes_mercury_performance_git_url="https://github.com/libretro/bsnes-me
 libretro_bsnes_mercury_performance_build_args="compiler=\"${CXX11}\" profile=\"performance\""
 libretro_bsnes_mercury_performance_build_products="out"
 
+include_core_neocd() {
+	register_module core "neocd" -theos_ios -ngc -ps3 -wii
+}
+libretro_neocd_name="NeoCD"
+libretro_neocd_git_url="https://github.com/libretro/neocd_libretro.git"
+libretro_neocd_git_submodules="yes"
+libretro_neocd_build_makefile="Makefile"
+
 include_core_smsplus() {
 	register_module core "smsplus" -theos_ios -ngc -ps3 -wii
 }