diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 5287c5cd8eca..6bae97c986f9 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,44 +1,44 @@
 # Created by: yoshiaki Uchikawa
 
 PORTNAME=	lame
 PORTVERSION=	3.100
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/3.100
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Fast MP3 encoder kit
 
 LICENSE=		LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake iconv libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp --disable-gtktest
 
 DOC_FILES=	API LICENSE README TODO USAGE
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 post-patch:
 # Fix parallel builds
 	@${REINPLACE_CMD} -e 's,test -d \.libs || mkdir,mkdir -p,' \
 		${WRKSRC}/libmp3lame/i386/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmp3lame.so.0
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/audio/lame/files/patch-libmp3lame_util.c b/audio/lame/files/patch-libmp3lame_util.c
new file mode 100644
index 000000000000..984bf2af9976
--- /dev/null
+++ b/audio/lame/files/patch-libmp3lame_util.c
@@ -0,0 +1,14 @@
+--- libmp3lame/util.c.orig	2021-06-11 15:08:59 UTC
++++ libmp3lame/util.c
+@@ -843,9 +843,8 @@ disable_FPE(void)
+      */
+ 
+ 
+-
+-
+-#if defined(__FreeBSD__) && !defined(__alpha__)
++/* https://reviews.llvm.org/D89557 */
++#if defined(__FreeBSD__) && defined(FP_X_INV) && defined(FP_X_DZ)
+     {
+         /* seet floating point mask to the Linux default */
+         fp_except_t mask;