diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index bb4f1cc97561..18db294092dc 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,58 +1,60 @@
 # Created by: dk
 
 PORTNAME=	fmsx
-PORTVERSION=	5.4
+PORTVERSION=	6.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://fms.komkon.org/fMSX/:code \
 		http://fms.komkon.org/fMSX/src/:rom
 DISTFILES=	fMSX${PORTVERSION:C/\.//}.zip:code \
 		MSX.ROM:rom MSX2.ROM:rom MSX2EXT.ROM:rom MSX2P.ROM:rom \
 		MSX2PEXT.ROM:rom FMPAC.ROM:rom DISK.ROM:rom MSXDOS2.ROM:rom \
 		PAINTER.ROM:rom KANJI.ROM:rom
 DIST_SUBDIR=	fmsx5
 EXTRACT_ONLY=	fMSX${PORTVERSION:C/\.//}.zip
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable MSX/MSX2/MSX2+ Emulator
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	unknown
 LICENSE_TEXT=	This program is NOT in public domain.\
 		It can be freely distributed for non-commercial purposes only. \
 		Legal status of distributed ROM images is unclear.
 LICENSE_PERMS=	none
 
 USES=		dos2unix gmake xorg zip
 USE_XORG=	x11 xext
 DOS2UNIX_FILES=	EMULib/Unix/LibUnix.c EMULib/Unix/NetUnix.c EMULib/Rules.gcc \
 		EMULib/Rules.Unix fMSX/fMSX.html
 
+CFLAGS+=	-fcommon
+
 NO_WRKSUBDIR=	yes
 SUB_FILES=	${PORTNAME}
 BUILD_WRKSRC=	${WRKSRC}/fMSX/Unix
 
 OPTIONS_DEFINE=	DOCS PULSEAUDIO
 OPTIONS_SINGLE=	BPP
 OPTIONS_SINGLE_BPP=	BPP8 BPP16 BPP24 BPP32
 OPTIONS_DEFAULT=	BPP32
 BPP8_DESC=	With BPP8
 BPP16_DESC=	With BPP16
 BPP24_DESC=	With BPP24
 BPP32_DESC=	With BPP32 (see pkg-message)
 BPP8_CFLAGS=	-DBPP8
 BPP16_CFLAGS=	-DBPP16
 BPP24_CFLAGS=	-DBPP24
 BPP32_CFLAGS=	-DBPP32
 PULSEAUDIO_CFLAGS=	-DPULSE_AUDIO
 PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio
 PULSEAUDIO_LIBS=	-lpulse-simple
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/fmsx ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${STAGEDIR}${PREFIX}/libexec/fmsx
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/*.ROM ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/fMSX/*.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/fmsx/distinfo b/emulators/fmsx/distinfo
index a04b4f439989..84e1d996da60 100644
--- a/emulators/fmsx/distinfo
+++ b/emulators/fmsx/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1531828409
-SHA256 (fmsx5/fMSX54.zip) = bd3ac4fd87586912bfe973c4e286ba9c30fee051a02afd5ea2b9fd6fec310825
-SIZE (fmsx5/fMSX54.zip) = 262278
+TIMESTAMP = 1634796123
+SHA256 (fmsx5/fMSX60.zip) = 683f03b0212e917828d4bff5747bffdf97e95cf73e711c7bb0f7f760ff6173a7
+SIZE (fmsx5/fMSX60.zip) = 266535
 SHA256 (fmsx5/MSX.ROM) = 999564a371dd2fdf7fbe8d853e82a68d557c27b7d87417639b2fa17704b83f78
 SIZE (fmsx5/MSX.ROM) = 32768
 SHA256 (fmsx5/MSX2.ROM) = 4bc4ae85ca5f28246cd3e7b7e017d298ddd375603657f84ef2c7954bc2d9b919
 SIZE (fmsx5/MSX2.ROM) = 32768
 SHA256 (fmsx5/MSX2EXT.ROM) = 6c6f421a10c428d960b7ecc990f99af1c638147f747bddca7b0bf0e2ab738300
 SIZE (fmsx5/MSX2EXT.ROM) = 16384
 SHA256 (fmsx5/MSX2P.ROM) = 9501a609be7d92e53fbd75fa65c8317563035d617744664892863ed54463db51
 SIZE (fmsx5/MSX2P.ROM) = 32768
 SHA256 (fmsx5/MSX2PEXT.ROM) = 36000685128f95ff515a128973f8d439116c1a1a8e38c1777293a428894434a2
 SIZE (fmsx5/MSX2PEXT.ROM) = 16384
 SHA256 (fmsx5/FMPAC.ROM) = 3cfe44646b69a622656b96305f1b975f48ca018839f7946895f7a1352d9720aa
 SIZE (fmsx5/FMPAC.ROM) = 65536
 SHA256 (fmsx5/DISK.ROM) = 31740a761447d7590c304338d389b0ae114546a8b9f79c9ffd5e374f80b7d354
 SIZE (fmsx5/DISK.ROM) = 16384
 SHA256 (fmsx5/MSXDOS2.ROM) = 08d582fda65f22e4397353855e828539a64df08a540e5d64706b3362ea09be17
 SIZE (fmsx5/MSXDOS2.ROM) = 65536
 SHA256 (fmsx5/PAINTER.ROM) = 62e646cc9f0d50422016f12a77995be5547649b5961b58c883ff4d48baac280f
 SIZE (fmsx5/PAINTER.ROM) = 65536
 SHA256 (fmsx5/KANJI.ROM) = 56785703b14f252ce77be586716dbf5d94125e93b9e6069ff26f7686566cd91a
 SIZE (fmsx5/KANJI.ROM) = 131072