diff --git a/recipes/blackberry/cores-qnx-generic b/recipes/blackberry/cores-qnx-generic
index ada1f0fb..0e9805ff 100644
--- a/recipes/blackberry/cores-qnx-generic
+++ b/recipes/blackberry/cores-qnx-generic
@@ -4,10 +4,10 @@ bluemsx libretro-bluemsx https://github.com/libretro/blueMSX-libretro.git master
 crocods libretro-crocods https://github.com/libretro/libretro-crocods.git master SUBMODULE YES GENERIC Makefile . 
 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 . 
-emux_chip8 libretro-emux_chip8 https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=chip8 
-emux_gb libretro-emux_gb https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=gb 
-emux_nes libretro-emux_nes https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=nes 
-emux_sms libretro-emux_sms https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=sms 
+emux_chip8 libretro-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=chip8 
+emux_gb libretro-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=gb 
+emux_nes libretro-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=nes 
+emux_sms libretro-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=sms 
 fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master PROJECT YES GENERIC makefile.libretro svn-current/trunk 
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master PROJECT YES GENERIC makefile.libretro svn-current/trunk 
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master PROJECT YES GENERIC makefile.libretro . 
diff --git a/recipes/linux/cores-linux-armhf-generic b/recipes/linux/cores-linux-armhf-generic
index 1d75871f..10cda355 100644
--- a/recipes/linux/cores-linux-armhf-generic
+++ b/recipes/linux/cores-linux-armhf-generic
@@ -13,10 +13,10 @@ cap32 libretro-cap32 https://github.com/libretro/libretro-cap32.git master PROJE
 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 . 
-emux_chip8 libretro-emux_chip8 https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=chip8 
-emux_gb libretro-emux_gb https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=gb 
-emux_nes libretro-emux_nes https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=nes 
-emux_sms libretro-emux_sms https://github.com/sronsse/emux master PROJECT YES GENERIC Makefile libretro TARGETS=sms 
+emux_chip8 libretro-emux_chip8 https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=chip8 
+emux_gb libretro-emux_gb https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=gb 
+emux_nes libretro-emux_nes https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=nes 
+emux_sms libretro-emux_sms https://github.com/libretro/emux master PROJECT YES LEIRADEL Makefile libretro MACHINE=sms 
 fbalpha libretro-fbalpha https://github.com/libretro/fbalpha.git master PROJECT YES GENERIC makefile.libretro svn-current/trunk 
 fbalpha2012 libretro-fbalpha2012 https://github.com/libretro/fbalpha2012.git master PROJECT YES GENERIC makefile.libretro svn-current/trunk 
 fbalpha2012_cps1 libretro-fbalpha2012_cps1 https://github.com/libretro/fbalpha2012_cps1.git master PROJECT YES GENERIC makefile.libretro .