diff --git a/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in b/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in
new file mode 100644
index 000000000..c401113fd
--- /dev/null
+++ b/games-emulation/flycast_libretro/additional-files/flycast_libretro.info.in
@@ -0,0 +1,40 @@
+display_name = "Sega - Dreamcast/NAOMI (Flycast)"
+authors = "flyinghead"
+supported_extensions = "chd|cdi|iso|elf|bin|cue|gdi|lst|zip|dat|7z|m3u"
+corename = "Flycast"
+manufacturer = "Sega"
+categories = "Emulator"
+systemname = "Sega Dreamcast"
+systemid = "dreamcast"
+database = "Sega - Dreamcast|Sega - NAOMI"
+license = "GPLv2"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+supports_no_game = "false"
+firmware_count = 8
+firmware0_desc = "dc/dc_boot.bin (Dreamcast BIOS)"
+firmware0_path = "dc/dc_boot.bin"
+firmware0_opt = "true"
+firmware1_desc = "dc/dc_flash.bin (Date/Time/Language)"
+firmware1_path = "dc/dc_flash.bin"
+firmware1_opt = "true"
+firmware2_desc = "dc/naomi.zip (Naomi Bios from MAME)"
+firmware2_path = "dc/naomi.zip"
+firmware2_opt  = "true"
+firmware3_desc = "dc/hod2bios.zip (Naomi The House of the Dead 2 Bios from MAME)"
+firmware3_path = "dc/hod2bios.zip"
+firmware3_opt  = "true"
+firmware4_desc = "dc/f355dlx.zip (Naomi Ferrari F355 Challenge deluxe Bios from MAME)"
+firmware4_path = "dc/f355dlx.zip"
+firmware4_opt  = "true"
+firmware5_desc = "dc/f355bios.zip (Naomi Ferrari F355 Challenge twin/deluxe Bios from MAME)"
+firmware5_path = "dc/f355bios.zip"
+firmware5_opt  = "true"
+firmware6_desc = "dc/airlbios.zip (Naomi Airline Pilots deluxe Bios from MAME)"
+firmware6_path = "dc/airlbios.zip"
+firmware6_opt  = "true"
+firmware7_desc = "dc/awbios.zip (Atomiswave BIOS from MAME)"
+firmware7_path = "dc/awbios.zip"
+firmware7_opt  = "true"
+notes = "(!) dc_boot.bin (md5): e10c53c2f8b90bab96ead2d368858623|(!) dc_flash.bin (md5): 0a93f7940c455905bea6e392dfde92a4|(!) naomi.zip (md5): eb4099aeb42ef089cfe94f8fe95e51f6|(!) hod2bios.zip (md5): 9c755171b222fb1f4e1439d5b709dbf1|(!) f355dlx.zip (md5): 5e83867c751f692a000afdf658dc181f|(!) f355bios.zip (md5): f126d318f135f38ee377fef2acf08d7e|(!) airlbios.zip (md5): 3f348c88af99a40fbd11fa435f28c69d|(!) awbios.zip (md5): 0ec5ae5b5a5c4959fa8b43fcf8687f7c"
+required_hw_api = "OpenGL Core >= 3.0 | OpenGL ES >= 2.0"
diff --git a/games-emulation/flycast_libretro/flycast_libretro-0.1_20191014.recipe b/games-emulation/flycast_libretro/flycast_libretro-0.1_20191014.recipe
new file mode 100644
index 000000000..746f0e1a1
--- /dev/null
+++ b/games-emulation/flycast_libretro/flycast_libretro-0.1_20191014.recipe
@@ -0,0 +1,58 @@
+SUMMARY="Flycast is a multiplatform Sega Dreamcast emulator"
+DESCRIPTION="Flycast is a cross-platform SEGA Dreamcast, Naomi and AtomisWave \
+emulator based off NullDC. It can accurately play several games and is in \
+active development."
+HOMEPAGE="https://github.com/libretro/flycast"
+COPYRIGHT="2013-2019, drk||Raziel, PsyMan, gb_away, the libretro team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+srcGitRev="a4dd6b427fe8200b31cca91758927bc10bfa58a9"
+SOURCE_URI="https://github.com/libretro/flycast/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="ccc18fd65cd9af6e10cb17e69c7bbaf35f584c23f5d98f9cecc65f3b4fc86d3a"
+SOURCE_FILENAME="flycast-${portVersion/_/-}-$srcGitRev.tar.gz"
+SOURCE_DIR="flycast-$srcGitRev"
+ADDITIONAL_FILES="flycast_libretro.info.in"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="?x86"
+
+PROVIDES="
+	flycast_libretro$secondaryArchSuffix = $portVersion
+	addon:flycast_libretro$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	retroarch$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libGL$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
+		$portDir/additional-files/flycast_libretro.info.in \
+		> flycast_libretro.info
+	make $jobArgs
+}
+
+INSTALL()
+{
+	install -m 0755 -d "$docDir"
+	install -m 0644 -t "$docDir" LICENSE README.md
+	install -m 0755 -d "$addOnsDir"/libretro
+	install -m 0644 -t "$addOnsDir"/libretro \
+		flycast_libretro.info \
+		flycast_libretro.so
+}
diff --git a/games-emulation/reicast_libretro/additional-files/reicast_libretro.info.in b/games-emulation/reicast_libretro/additional-files/reicast_libretro.info.in
deleted file mode 100644
index 5856624fc..000000000
--- a/games-emulation/reicast_libretro/additional-files/reicast_libretro.info.in
+++ /dev/null
@@ -1,20 +0,0 @@
-display_name = "Sega - Dreamcast (Reicast)"
-authors = "skmp"
-supported_extensions = "cdi|gdi|chd|cue"
-corename = "Reicast"
-manufacturer = "Sega"
-categories = "Emulator"
-systemname = "Sega Dreamcast"
-database = "Sega - Dreamcast"
-license = "GPLv2"
-permissions = ""
-display_version = "@DISPLAY_VERSION@"
-supports_no_game = "false"
-firmware_count = 2
-firmware0_desc = "dc_boot.bin (Dreamcast BIOS)"
-firmware0_path = "dc/dc_boot.bin"
-firmware0_opt = "false"
-firmware1_desc = "dc_flash.bin (Date/Time/Language)"
-firmware1_path = "dc/dc_flash.bin"
-firmware1_opt = "false"
-notes = "(!) dc_boot.bin (md5): e10c53c2f8b90bab96ead2d368858623|(!) dc_flash.bin (md5): 0a93f7940c455905bea6e392dfde92a4"
diff --git a/games-emulation/reicast_libretro/reicast_libretro-r6_20180711.recipe b/games-emulation/reicast_libretro/reicast_libretro-r6_20180711.recipe
deleted file mode 100644
index a4cbb8261..000000000
--- a/games-emulation/reicast_libretro/reicast_libretro-r6_20180711.recipe
+++ /dev/null
@@ -1,56 +0,0 @@
-SUMMARY="A port of Reicast, a SEGA Dreamcast emulator to the libretro API"
-DESCRIPTION="Reicast is a cross-platform SEGA Dreamcast, Naomi and AtomisWave \
-emulator based off NullDC. It can accurately play several games and is in \
-active development."
-HOMEPAGE="http://www.reicast.com"
-COPYRIGHT="2013-2018, drk||Raziel, PsyMan, gb_away, the libretro team"
-LICENSE="GNU GPL v2"
-REVISION="1"
-srcGitRev="1d966f149becab535a56b2cf415e9ff36e07622e"
-SOURCE_URI="https://github.com/libretro/reicast-emulator/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="38aa2c7156b12ac38be8c3f497d1d77c92199dab7b1a078594fdc0712f270bec"
-SOURCE_FILENAME="reicast-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
-SOURCE_DIR="reicast-emulator-$srcGitRev"
-ADDITIONAL_FILES="reicast_libretro.info.in"
-
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
-
-PROVIDES="
-	reicast_libretro$secondaryArchSuffix = $portVersion
-	addon:reicast_libretro$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	retroarch$secondaryArchSuffix
-	lib:libGL$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libGL$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
-		$portDir/additional-files/reicast_libretro.info.in \
-		> reicast_libretro.info
-	make $jobArgs -f Makefile
-}
-
-INSTALL()
-{
-	install -m 0755 -d "$docDir"
-	install -m 0644 -t "$docDir" LICENSE README.md
-	install -m 0755 -d "$addOnsDir"/libretro
-	install -m 0644 -t "$addOnsDir"/libretro \
-		reicast_libretro.info \
-		reicast_libretro.so
-}