diff --git a/games/libretro-emux/Makefile b/games/libretro-emux/Makefile
index ce720dfbd326..c272bc0ac44e 100644
--- a/games/libretro-emux/Makefile
+++ b/games/libretro-emux/Makefile
@@ -1,33 +1,40 @@
 PORTNAME=	libretro-emux
-PORTVERSION=	0.20211014
+DISTVERSION=	0.20191014
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-platform emulator project supporting various machines
 WWW=		https://github.com/libretro/emux
 
 LICENSE=	GPLv2
 
 USES=		compiler:c++11-lib gmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	emux
-GH_TAGNAME=	640d4ba
+GH_TAGNAME=	640d4bae7d4757f5377dbeb42f2d02763895095c
 
 PLIST_FILES=	lib/libretro/emux_chip8_libretro.so \
 		lib/libretro/emux_gb_libretro.so \
 		lib/libretro/emux_nes_libretro.so \
 		lib/libretro/emux_sms_libretro.so
 
-MAKEFILE=	Makefile.freebsd
+BUILD_WRKSRC=	${WRKSRC}/libretro
+MAKEFILE=	Makefile.bsd
+
+EMUX_MACHINES=	chip8 gb nes sms
+
+do-build:
+.    for machine in ${EMUX_MACHINES}
+	(cd ${BUILD_WRKSRC}; ${DO_MAKE_BUILD} MACHINE=${machine})
+.    endfor
 
 do-install:
-	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/libretro/emux_chip8_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/libretro/emux_gb_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/libretro/emux_nes_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
-	${INSTALL_LIB} ${WRKSRC}/libretro/emux_sms_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
+	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro
+.    for machine in ${EMUX_MACHINES}
+	${INSTALL_LIB} ${WRKSRC}/libretro/emux_${machine}_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro
+.     endfor
 
 .include <bsd.port.mk>
diff --git a/games/libretro-emux/distinfo b/games/libretro-emux/distinfo
index df7a16ed4103..cbb771e71b93 100644
--- a/games/libretro-emux/distinfo
+++ b/games/libretro-emux/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649324212
-SHA256 (libretro-emux-0.20211014-640d4ba_GH0.tar.gz) = a3a3ad177d8859b2c114d340b9d287048aa45d69b6829903fd24f01ac9aea81c
-SIZE (libretro-emux-0.20211014-640d4ba_GH0.tar.gz) = 187661
+TIMESTAMP = 1698314820
+SHA256 (libretro-emux-0.20191014-640d4bae7d4757f5377dbeb42f2d02763895095c_GH0.tar.gz) = 6bacec4fb2d71976e577f267732a70f2da5caa73cbe9ff928794ec6708dd8dc7
+SIZE (libretro-emux-0.20191014-640d4bae7d4757f5377dbeb42f2d02763895095c_GH0.tar.gz) = 187797
diff --git a/games/libretro-emux/files/patch-Makefile.freebsd b/games/libretro-emux/files/patch-Makefile.freebsd
deleted file mode 100644
index 9db73a926727..000000000000
--- a/games/libretro-emux/files/patch-Makefile.freebsd
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.freebsd.orig	2020-03-17 22:18:45 UTC
-+++ Makefile.freebsd
-@@ -0,0 +1,7 @@
-+all:
-+	cd libretro && \
-+		${MAKE} -f Makefile.bsd MACHINE=chip8 && \
-+		${MAKE} -f Makefile.bsd MACHINE=gb && \
-+		${MAKE} -f Makefile.bsd MACHINE=nes && \
-+		${MAKE} -f Makefile.bsd MACHINE=sms
-+