diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 9112397fb2fb..66c1e38eb738 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -1,86 +1,84 @@
 # Created by: Yoichi Asai <yatt@luna2.org>
 
 PORTNAME=	timidity++
 PORTVERSION=	2.15.0
 CATEGORIES+=	audio
 MASTER_SITES=	SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
 DISTNAME=	TiMidity++-${PORTVERSION}
 
-MAINTAINER?=	ports@FreeBSD.org
+MAINTAINER?=	fuz@fuz.su
 COMMENT?=	Software MIDI player
 
 LICENSE=	GPLv2+
 
-BROKEN_riscv64=	fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h
-
 LIB_DEPENDS=	libarc.so:archivers/libarc
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg
 RUN_DEPENDS=	eawpats>0:audio/eawpats
 .endif
 
 USES=		gmake localbase tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	SHLD="${CC} -shared"
 
 CPPFLAGS+=	-I${LOCALBASE}/include/libarc
 LDFLAGS+=	-Wl,--export-dynamic
 
 PLIST_SUB+=	TIMID_LIBDIR="${TIMID_LIBDIR}" EUCJP_LOCALE="${EUCJP_LOCALE}"
 
 .if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=		DOCS EAWPLUS X11
 OPTIONS_DEFAULT=	X11
 CONFIGURE_ARGS+=	--enable-audio=oss,vorbis
 EAWPLUS_DESC=		Collection of Gravis Ultrasound MIDI patches
 EAWPLUS_RUN_DEPENDS=	eawplus>0:audio/eawplus
 X11_LIB_DEPENDS=	libpng.so:graphics/png
 X11_USES=		xorg
 X11_USE=		xorg=x11,xext
 X11_CONFIGURE_ON=	--with-x --enable-spectrogram --enable-wrd \
 			--enable-dynamic
 X11_CONFIGURE_OFF=	--without-x --disable-spectrogram --disable-wrd \
 			--disable-dynamic
 X11_CPPFLAGS=		$$(libpng-config --I_opts)
 .endif
 
 TIMID_LIBDIR=	lib/timidity
 EUCJP_LOCALE=	ja_JP.eucJP
 
 .include <bsd.port.options.mk>
 
 .if defined(PKGNAMESUFFIX)
 .include "Makefile.interface"
 .else
 USES+=		ncurses
 CONFIGURE_ARGS+=--enable-interface=ncurses,vt100,server \
 		--enable-network
 
 CONFLICTS_INSTALL=	timidity-[0-9]*
 
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 
 pre-patch:
 	@${RM} ${WRKSRC}/libarc/*.h
 	@${RM} ${WRKSRC}/utils/mblock.h
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/timidity
 
 post-install::
 	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_MAN} timidity.1 \
 		${STAGEDIR}${MANPREFIX}/man/ja/man1)
 	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_MAN} timidity.cfg.5 \
 		${STAGEDIR}${MANPREFIX}/man/ja/man5)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} ${DOCFILES} \
 		${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
 	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} ${DOCFILES} \
 		${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME})
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/timidity
 
 .endif # PKGNAMESUFFIX
 .include <bsd.port.mk>
diff --git a/audio/timidity++/files/patch-timidity_timidity.c b/audio/timidity++/files/patch-timidity_timidity.c
new file mode 100644
index 000000000000..e88c78ccd7ec
--- /dev/null
+++ b/audio/timidity++/files/patch-timidity_timidity.c
@@ -0,0 +1,12 @@
+--- timidity/timidity.c.orig	2018-08-28 23:33:39 UTC
++++ timidity/timidity.c
+@@ -5393,7 +5393,8 @@ MAIN_INTERFACE void timidity_start_initialize(void)
+     fp_except fpexp;
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(FP_X_INV) && defined(FP_X_DZ) && \
++  (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+     fpexp = fpgetmask();
+     fpsetmask(fpexp & ~(FP_X_INV|FP_X_DZ));
+ #endif