diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index b02e14b4d2e4..20ab9e68ba30 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -1,24 +1,33 @@
 PORTNAME=	Xbae
 PORTVERSION=	4.60.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits math
 MASTER_SITES=	SF
 DISTNAME=	xbae-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Motif-based widget which displays a grid of cells as a spreadsheet
 WWW=		http://xbae.sourceforge.net/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	Fails to link: missing sbrk
 BROKEN_riscv64=	Fails to link: missing sbrk
 
 USES=		libtool motif
 USE_LDCONFIG=	yes
+USE_XORG=	ice sm x11 xext xt
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-production
+
 INSTALL_TARGET=	install-strip
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 .include <bsd.port.mk>