diff --git a/build-config.sh b/build-config.sh
index 9bf578d1..bddb8660 100644
--- a/build-config.sh
+++ b/build-config.sh
@@ -62,8 +62,10 @@ include_core_meteor
 include_core_nxengine
 include_core_prboom
 include_core_mrboom
+include_core_crocods
 include_core_xrick
-include_core_vice
+include_core_vice_x64
+include_core_vice_x128
 include_core_stella
 include_core_desmume
 include_core_melonds
diff --git a/dist/info/crocods_libretro.info b/dist/info/crocods_libretro.info
new file mode 100644
index 00000000..96c02655
--- /dev/null
+++ b/dist/info/crocods_libretro.info
@@ -0,0 +1,11 @@
+display_name = "Amstrad CPC (CrocoDS)"
+authors = "RedBug"
+supported_extensions = "dsk|sna|kcr"
+corename = "CrocoDS"
+manufacturer = "Amstrad"
+categories = "Emulator"
+systemname = "CPC"
+license = "MIT"
+permissions = ""
+display_version = "v1"
+supports_no_game = "false"
diff --git a/libretro-build-android-mk.sh b/libretro-build-android-mk.sh
index 52366cb6..e9239fb8 100755
--- a/libretro-build-android-mk.sh
+++ b/libretro-build-android-mk.sh
@@ -160,6 +160,8 @@ WANT_CORES=" \
 	mame2003 \
 	mrboom \
 	xrick \
+	pocketcdg \
+	crocods \
 	pocketsnes"
 fi
 
diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh
index 1c6f9bc8..1ecdf53d 100755
--- a/libretro-buildbot-recipe.sh
+++ b/libretro-buildbot-recipe.sh
@@ -596,7 +596,7 @@ build_libretro_bsnes() {
 
 	echo -------------------------------------------------- 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}.log
 	if [ "${PROFILE}" = "cpp98" ]; then
-		${HELPER} ${MAKE} platform="${PLATFORM}" "${COMPILER}" "-j${JOBS}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}.log
+		${HELPER} ${MAKE} platform="${PLATFORM}" ${COMPILER} "-j${JOBS}" 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}.log
 	elif [ "${PROFILE}" = "bnes" ]; then
 		echo "BUILD CMD: ${HELPER} ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler=${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}.log
 		${HELPER} ${MAKE} -f Makefile ${COMPILER} "-j${JOBS}" compiler="${BSNESCOMPILER}" platform=${FORMAT_COMPILER_TARGET} 2>&1 | tee -a $TMPDIR/log/${BOT}/${LOGDATE}/${LOGDATE}_${NAME}_${PROFILE}_${PLATFORM}.log
diff --git a/recipes/android/cores-android-jni b/recipes/android/cores-android-jni
index 835032ba..8a961be9 100644
--- a/recipes/android/cores-android-jni
+++ b/recipes/android/cores-android-jni
@@ -13,7 +13,8 @@ snes9x2005 libretro-snes9x2005 https://github.com/libretro/snes9x2005.git PROJEC
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git PROJECT YES GENERIC_JNI Makefile jni 
 snes9x libretro-snes9x https://github.com/libretro/snes9x.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
 snes9x2010 libretro-snes9x2010 https://github.com/libretro/snes9x2010.git PROJECT YES GENERIC_JNI Makefile jni 
-craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC_JNI Makefile.libretro jni 
+craft libretro-craft https://github.com/libretro/Craft.git PROJECT YES GENERIC_JNI Makefile.libretro jni 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git PROJECT YES GENERIC_JNI Makefile jni 
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC_JNI Makefile.libretro desmume/src/libretro/jni 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_JNI Makefile jni
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC_JNI Makefile.libretro jni 
@@ -34,7 +35,7 @@ mednafen_pce_fast libretro-beetle_pce_fast https://github.com/libretro/beetle-pc
 mednafen_pcfx libretro-beetle_pcfx https://github.com/libretro/beetle-pcfx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_psx libretro-beetle_psx https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_psx_hw libretro-beetle_psx_hw https://github.com/libretro/beetle-psx-libretro.git PROJECT YES GENERIC_JNI Makefile parallel-psx/jni 
-mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git PROJECT YES GENERIC Makefile . 
+mednafen_saturn libretro-beetle_saturn https://github.com/libretro/beetle-saturn-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_snes libretro-beetle_snes https://github.com/libretro/beetle-bsnes-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_supergrafx libretro-beetle_supergrafx https://github.com/libretro/beetle-supergrafx-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 mednafen_vb libretro-beetle_vb https://github.com/libretro/beetle-vb-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
@@ -61,5 +62,6 @@ vba_next libretro-vba-next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_JNI Makefile src/libretro/jni 
 vecx libretro-vecx https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC_JNI Makefile.libretro jni 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
+vice_x64 libretro-vice https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC_JNI Makefile jni 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC_JNI Makefile libretro/jni 
diff --git a/recipes/apple/cores-ios-generic b/recipes/apple/cores-ios-generic
index 8223448c..ef850f2a 100644
--- a/recipes/apple/cores-ios-generic
+++ b/recipes/apple/cores-ios-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 PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
 craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . 
@@ -76,5 +77,7 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
diff --git a/recipes/apple/cores-ios9-generic b/recipes/apple/cores-ios9-generic
index e1f25f0b..8d8038b5 100644
--- a/recipes/apple/cores-ios9-generic
+++ b/recipes/apple/cores-ios9-generic
@@ -10,6 +10,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 PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
 craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . 
@@ -75,5 +76,7 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
diff --git a/recipes/apple/cores-osx-x64-generic b/recipes/apple/cores-osx-x64-generic
index 88c0d35f..49e24b8e 100644
--- a/recipes/apple/cores-osx-x64-generic
+++ b/recipes/apple/cores-osx-x64-generic
@@ -10,6 +10,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 PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
 craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . 
@@ -76,6 +77,8 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
 mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mame 
diff --git a/recipes/blackberry/cores-qnx-generic b/recipes/blackberry/cores-qnx-generic
index 71bca7f0..a6b86597 100644
--- a/recipes/blackberry/cores-qnx-generic
+++ b/recipes/blackberry/cores-qnx-generic
@@ -1,6 +1,7 @@
 2048 libretro-2048  https://github.com/libretro/libretro-2048.git PROJECT YES GENERIC Makefile.libretro . 
 4do libretro-4do https://github.com/libretro/4do-libretro.git PROJECT YES GENERIC Makefile . 
 bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 emux_chip8 libretro-emux_chip8 https://github.com/sronsse/emux PROJECT YES GENERIC Makefile libretro TARGETS=chip8 
diff --git a/recipes/linux/cores-linux-x64-generic b/recipes/linux/cores-linux-x64-generic
index 1cc41120..49b388ba 100644
--- a/recipes/linux/cores-linux-x64-generic
+++ b/recipes/linux/cores-linux-x64-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 PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
 craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git PROJECT YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
@@ -23,7 +24,6 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20
 fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 ffmpeg libretro-ffmpeg  https://github.com/libretro/FFmpeg.git PROJECT YES GENERIC_GL Makefile libretro 
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . 
-craft libretro-craft https://github.com/libretro/craft-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 easyrpg libretro-easyrpg https://github.com/libretro/easyrpg-libretro.git PROJECT YES GENERIC builds/libretro/Makefile.libretro . 
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile . 
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
@@ -80,6 +80,8 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
 mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mame PTR64=1 
diff --git a/recipes/linux/cores-linux-x86-generic b/recipes/linux/cores-linux-x86-generic
index 99e2773b..7eb4cf97 100644
--- a/recipes/linux/cores-linux-x86-generic
+++ b/recipes/linux/cores-linux-x86-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 PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
 craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git PROJECT YES GENERIC Makefile .
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC Makefile . 
@@ -23,7 +24,6 @@ fbalpha2012_neogeo libretro-fbalpha_neogeo https://github.com/libretro/fbalpha20
 fceumm libretro-fceuumm  https://github.com/libretro/libretro-fceumm.git PROJECT YES GENERIC Makefile.libretro . 
 ffmpeg libretro-ffmpeg  https://github.com/libretro/FFmpeg.git PROJECT YES GENERIC_GL Makefile libretro 
 fmsx libretro-fmsx https://github.com/libretro/fmsx-libretro.git PROJECT YES GENERIC Makefile . 
-craft libretro-craft https://github.com/libretro/craft-libretro.git PROJECT YES GENERIC Makefile.libretro . 
 gambatte libretro-gambatte https://github.com/libretro/gambatte-libretro.git PROJECT YES GENERIC Makefile . 
 genesis_plus_gx libretro-genesis_plus_gx https://github.com/libretro/Genesis-Plus-GX.git PROJECT YES GENERIC Makefile.libretro . 
 mupen64plus libretro-mupen64plus https://github.com/libretro/mupen64plus-libretro.git PROJECT YES GENERIC_GL Makefile . WITH_DYNAREC=x86
@@ -76,6 +76,8 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile .  EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
 mame2014 libretro-mame2014 https://github.com/libretro/mame2014-libretro.git PROJECT YES GENERIC Makefile . TARGET=mame PTR64=0 
diff --git a/recipes/windows/cores-windows-x64_seh-generic b/recipes/windows/cores-windows-x64_seh-generic
index 8ff33418..1dbab51c 100644
--- a/recipes/windows/cores-windows-x64_seh-generic
+++ b/recipes/windows/cores-windows-x64_seh-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 PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
 craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_ALT Makefile . 
 dosbox libretro-dosbox https://github.com/libretro/dosbox-libretro.git PROJECT YES GENERIC Makefile.libretro . 
@@ -79,5 +80,7 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
diff --git a/recipes/windows/cores-windows-x86_dw2-generic b/recipes/windows/cores-windows-x86_dw2-generic
index 547aaadc..f64399d7 100644
--- a/recipes/windows/cores-windows-x86_dw2-generic
+++ b/recipes/windows/cores-windows-x86_dw2-generic
@@ -10,6 +10,8 @@ bsnes_cplusplus98 libretro-bsnes_cplusplus98 https://github.com/libretro/bsnes-l
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . accuracy 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . balanced 
 bsnes_mercury libretro-bsnes_mercury https://github.com/libretro/bsnes-mercury.git PROJECT YES BSNES Makefile . performance 
+craft libretro-craft https://github.com/libretro/craft PROJECT YES GENERIC Makefile.libretro . 
+crocods libretro-crocods https://github.com/libretro/libretro-crocods.git SUBMODULE YES GENERIC Makefile . 
 dinothawr libretro-dinothawr https://github.com/libretro/Dinothawr.git PROJECT YES GENERIC_ALT Makefile . 
 fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git PROJECT YES GENERIC makefile.libretro svn-current/trunk 
@@ -64,6 +66,8 @@ vba_next libretro-vba_next https://github.com/libretro/vba-next.git PROJECT YES
 vbam libretro-vbam https://github.com/libretro/vbam-libretro.git PROJECT YES GENERIC_ALT Makefile src/libretro 
 vecx libretro-vecx  https://github.com/libretro/libretro-vecx.git PROJECT YES GENERIC Makefile.libretro . 
 virtualjaguar libretro-virtualjaguar https://github.com/libretro/virtualjaguar-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x64 libretro-vice_x64 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . 
+vice_x128 libretro-vice_x128 https://github.com/libretro/vice-libretro.git PROJECT YES GENERIC Makefile . EMUTYPE=x128 
 xrick libretro-xrick https://github.com/libretro/xrick-libretro.git PROJECT YES GENERIC Makefile . 
 yabause libretro-yabause https://github.com/libretro/yabause.git PROJECT YES GENERIC Makefile libretro 
 desmume libretro-desmume https://github.com/libretro/desmume.git PROJECT YES GENERIC Makefile.libretro desmume 
diff --git a/rules.d/core-rules.sh b/rules.d/core-rules.sh
index f9106b16..917cd280 100644
--- a/rules.d/core-rules.sh
+++ b/rules.d/core-rules.sh
@@ -24,6 +24,13 @@ libretro_bsnes_performance_git_url="https://github.com/libretro/bsnes-libretro.g
 libretro_bsnes_performance_build_args="compiler=\"${CXX11}\" profile=\"performance\""
 libretro_bsnes_performance_build_products="out"
 
+include_core_crocods() {
+	register_module core "crocods"
+}
+libretro_crocods_name="CrocoDS"
+libretro_crocods_git_url="https://github.com/libretro/libretro-crocods.git"
+libretro_crocods_build_makefile="Makefile"
+
 include_core_mrboom() {
 	register_module core "mrboom"
 }
@@ -31,12 +38,21 @@ libretro_mrboom_name="Mr.Boom"
 libretro_mrboom_git_url="https://github.com/libretro/mrboom-libretro.git"
 libretro_mrboom_build_makefile="Makefile"
 
-include_core_vice() {
-	register_module core "vice"
+include_core_vice_x64() {
+	register_module core "vice_x64"
 }
-libretro_vice_name="VICE"
-libretro_vice_git_url="https://github.com/libretro/vice-libretro.git"
-libretro_vice_build_makefile="Makefile"
+libretro_vice_x64_name="VICE x64"
+libretro_vice_x64_git_url="https://github.com/libretro/vice-libretro.git"
+libretro_vice_x64_build_makefile="Makefile"
+
+include_core_vice_x128() {
+	register_module core "vice_x128"
+}
+libretro_vice_x128_name="VICE x128"
+libretro_vice_x128_git_url="https://github.com/libretro/vice-libretro.git"
+libretro_vice_x128_build_makefile="Makefile"
+libretro_vice_x128_build_args="EMUTYPE=\"x128\""
+libretro_vice_x128_build_cores="vice_x128"
 
 include_core_xrick() {
 	register_module core "xrick"