diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index eb721da18839..4b71aa5cc48e 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,41 +1,50 @@
 PORTNAME=	elk
 PORTVERSION=	3.99.8
 PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://sam.zoy.org/elk/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeddable Scheme interpreter
 WWW=		http://sam.zoy.org/projects/elk/
 
+		#libelf.so:devel/libelf
 LIB_DEPENDS=	libgdbm.so:databases/gdbm \
-		libelf.so:devel/libelf
+		libXaw.so:x11-toolkits/libXaw
 
-USES=		libtool motif tar:bzip2
-GNU_CONFIGURE=	yes
+USES=		libtool localbase:ldflags motif tar:bzip2 xorg
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
+USE_XORG=	ice sm x11 xext xmu xt
+
+GNU_CONFIGURE=	yes
+
 INSTALL_TARGET=	install-strip
+
 MAKE_JOBS_UNSAFE=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include/libelf -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include/libelf
 
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CFLAGS=		-O0
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc examples||g' ${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/elk.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${TAR} -C ${WRKSRC}/examples --exclude "*Makefile*" -cf - . | \
 		${TAR} -C ${STAGEDIR}${EXAMPLESDIR} --unlink -xf -
 	@${FIND} ${STAGEDIR}${EXAMPLESDIR}/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;
 
 .include <bsd.port.post.mk>