diff --git a/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in b/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
new file mode 100644
index 000000000..3bb722419
--- /dev/null
+++ b/games-emulation/mednafen_wswan_libretro/additional-files/mednafen_wswan_libretro.info.in
@@ -0,0 +1,12 @@
+display_name = "Bandai - WonderSwan/Color (Beetle Cygne)"
+authors = "Dox|Mednafen Team"
+supported_extensions = "ws|wsc"
+corename = "Beetle WonderSwan"
+manufacturer = "Bandai"
+categories = "Emulator"
+systemname = "WonderSwan/Color"
+database = "Bandai - WonderSwan|Bandai - WonderSwan Color"
+license = "GPLv2"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+supports_no_game = "false"
diff --git a/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20180220.recipe b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20180220.recipe
new file mode 100644
index 000000000..522f8fa1b
--- /dev/null
+++ b/games-emulation/mednafen_wswan_libretro/mednafen_wswan_libretro-0.9.35.1_20180220.recipe
@@ -0,0 +1,51 @@
+SUMMARY="A standalone port of Mednafen WonderSwan to libretro"
+DESCRIPTION="This is a standalone port of Mednafen WonderSwan to libretro, a \
+Bandai WonderSwan emulator. It is a fork of Cygne."
+HOMEPAGE="https://mednafen.github.io/documentation/wswan.html"
+COPYRIGHT="2005-2018 Forgotten, the Mednafen team, the libretro team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+srcGitRev="93459f9eb4d3704a4f2ba4e3f4a986f9ace2615a"
+SOURCE_URI="https://github.com/libretro/beetle-wswan-libretro/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="5bafa89b4473d96ef358a21145399100067ef22300187e1beef6c7cfa4677dff"
+SOURCE_FILENAME="libretro-mednafen-wswan-${portVersion/_/-}-$srcGitRev.tar.gz"
+SOURCE_DIR="beetle-wswan-libretro-$srcGitRev"
+ADDITIONAL_FILES="mednafen_wswan_libretro.info.in"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	mednafen_wswan_libretro$secondaryArchSuffix = $portVersion
+	addon:mednafen_wswan_libretro$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	retroarch$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
+		$portDir/additional-files/mednafen_wswan_libretro.info.in \
+		> mednafen_wswan_libretro.info
+	make $jobArgs
+}
+
+INSTALL()
+{
+	install -m 0755 -d "$docDir"
+	install -m 0644 -t "$docDir" COPYING readme.md
+	install -m 0755 -d "$addOnsDir"/libretro
+	install -m 0644 -t "$addOnsDir"/libretro \
+		mednafen_wswan_libretro.info \
+		mednafen_wswan_libretro.so
+}