diff --git a/app-emulation/puae_libretro/additional-files/puae_libretro.info.in b/app-emulation/puae_libretro/additional-files/puae_libretro.info.in
new file mode 100644
index 000000000..7ff1837b0
--- /dev/null
+++ b/app-emulation/puae_libretro/additional-files/puae_libretro.info.in
@@ -0,0 +1,54 @@
+# Software Information
+display_name = "Commodore - Amiga (PUAE)"
+categories = "Emulator"
+authors = "UAE Team"
+corename = "PUAE"
+supported_extensions = "adf|adz|dms|fdi|ipf|hdf|hdz|lha|slave|info|cue|ccd|nrg|mds|iso|chd|uae|m3u|zip|7z"
+license = "GPLv2"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Commodore"
+systemname = "Amiga"
+systemid = "commodore_amiga"
+
+# Libretro Features
+database = "Commodore - Amiga"
+supports_no_game = "true"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+is_experimental = "false"
+
+# Firmware
+firmware_count = 6
+firmware0_desc = "kick34005.A500 (Amiga 500 BIOS, Kickstart v1.3 Rev. 34.005)"
+firmware0_path = "kick34005.A500"
+firmware0_opt = "false"
+firmware1_desc = "kick37175.A500 (Amiga 500+ BIOS, Kickstart v2.04 Rev. 37.175)"
+firmware1_path = "kick37175.A500"
+firmware1_opt = "false"
+firmware2_desc = "kick40063.A600 (Amiga 600 BIOS, Kickstart v3.1 Rev. 40.063)"
+firmware2_path = "kick40063.A600"
+firmware2_opt = "false"
+firmware3_desc = "kick40068.A1200 (Amiga 1200 BIOS, Kickstart v3.1 Rev. 40.068)"
+firmware3_path = "kick40068.A1200"
+firmware3_opt = "false"
+firmware4_desc = "kick40060.CD32 (Amiga CD32 BIOS, Kickstart v3.1 Rev. 40.060)"
+firmware4_path = "kick40060.CD32"
+firmware4_opt = "true"
+firmware5_desc = "kick40060.CD32.ext (Amiga CD32 Extended BIOS, CD32 Extended ROM Rev. 40.060)"
+firmware5_path = "kick40060.CD32.ext"
+firmware5_opt = "true"
+notes = "(!) kick34005.A500 (md5): 82a21c1890cae844b3df741f2762d48d|(!) kick37175.A500 (md5): dc10d7bdd1b6f450773dfb558477c230|(!) kick40063.A600 (md5): e40a5dfb3d017ba8779faba30cbd1c8e|(!) kick40068.A1200 (md5): 646773759326fbac3b2311fd8c8793ee|(!) kick40060.CD32 (md5): 5f8924d013dd57a89cf349f4cdedc6b1|(!) kick40060.CD32.ext (md5): bb72565701b1b6faece07d68ea5da639"
+
+description = "A port of the PUAE Amiga emulator, which is itself a continuation of the E-UAE emulator, to libretro. The core has a built-in AROS fallback Kickstart that is compatible enough for some A500 games, but a proper Kickstart ROM is preferred. This core is well-integrated with libretro and is the first option users should try when seeking to play Amiga games via libretro."
diff --git a/app-emulation/puae_libretro/puae_libretro-2.6.1_20210427.recipe b/app-emulation/puae_libretro/puae_libretro-2.6.1_20210427.recipe
new file mode 100644
index 000000000..a225b3e48
--- /dev/null
+++ b/app-emulation/puae_libretro/puae_libretro-2.6.1_20210427.recipe
@@ -0,0 +1,56 @@
+SUMMARY="A Commodore Amiga emulator for the libretro API"
+DESCRIPTION="A port of the PUAE Amiga emulator, which is itself a continuation \
+of the E-UAE emulator, to libretro. The core has a built-in AROS fallback \
+Kickstart that is compatible enough for some A500 games, but a proper \
+KS ROM is preferred. This core is well-integrated with libretro and is the \
+first option users should try when seeking to play Amiga games via libretro."
+HOMEPAGE="https://github.com/libretro/libretro-uae"
+COPYRIGHT="2014-2021, GnoStiC, Richard Drummond, the libretro team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+srcGitRev="26e303a522b7a8f4c46b8ad32dc3d56f4357c43f"
+SOURCE_URI="https://github.com/libretro/libretro-uae/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="3e8963b48700374bb91a48207592b92fd023f813807b8e42a9ed9c9021329200"
+SOURCE_FILENAME="libretro-uae-${portVersion/_/-}-$srcGitRev.tar.gz"
+SOURCE_DIR="libretro-uae-$srcGitRev"
+ADDITIONAL_FILES="puae_libretro.info.in"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	uae_libretro$secondaryArchSuffix = $portVersion
+	addon:uae_libretro$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	retroarch$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
+		$portDir/additional-files/puae_libretro.info.in \
+		> puae_libretro.info
+	make $jobArgs GIT_VERSION=${srcGitRev:0:7}
+}
+
+INSTALL()
+{
+	install -m 0755 -d "$docDir"
+	install -m 0644 -t "$docDir" README.md COPYING
+	install -m 0755 -d "$addOnsDir"/libretro
+	install -m 0644 -t "$addOnsDir"/libretro \
+		puae_libretro.info \
+		puae_libretro.so
+}