diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile
index 0ca10c803db1..e3b1879e6136 100644
--- a/games/lwjgl/Makefile
+++ b/games/lwjgl/Makefile
@@ -1,79 +1,81 @@
 PORTNAME=	lwjgl
 DISTVERSION=	2.9.4.20161208
+PORTREVISION=	1
 CATEGORIES=	games java
 
 MAINTAINER=	freebsd@skinc.ru
 COMMENT=	Lightweight Java Game Library
 WWW=		https://legacy.lwjgl.org
 
 LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=	amd64 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils \
 		${JAVAJARDIR}/jinput/jinput.jar:games/jinput
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix xorg
+DOS2UNIX_REGEX=	.*.[^jp][^an][^rg]$
+USE_ANT=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	LWJGL
 GH_TAGNAME=	2df01dd
 
-DOS2UNIX_REGEX=	.*.[^jp][^an][^rg]$
-USE_JAVA=	yes
+USE_JAVA=	8
 USE_LDCONFIG=	yes
-USE_ANT=	yes
-USE_XORG=	xcursor xrandr xxf86vm
+USE_XORG=	x11 xcursor xext xrandr xxf86vm
 MAKE_ENV+=	CLASSPATH=${JAVAJARDIR}/jutils/jutils.jar:${JAVAJARDIR}/jinput/jinput.jar:${WRKSRC}/${DISTNAME}/jar/
 ALL_TARGET=	jars compile_native
 
+PLIST_DIRS=	${JAVAJARDIR}/${PORTNAME} \
+		lib/${PORTNAME}
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar \
 		${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_test.jar \
 		${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_util.jar \
 		${JAVAJARDIR}/${PORTNAME}/${PORTNAME}_util_applet.jar
-PLIST_DIRS=	${JAVAJARDIR}/${PORTNAME} \
-		lib/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == i386
 PLIST_FILES+=	lib/${PORTNAME}/lib${PORTNAME}.so
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
 PLIST_FILES+=	lib/${PORTNAME}/lib${PORTNAME}64.so
 .endif
 
 .if ${ARCH:Mpowerpc64*}
 MAKE_ARGS+=	-Dbuild.64bit.only=1
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' \
 		-e '/executable/s/cc/${CC}/g' \
 		${WRKSRC}/platform_build/bsd_ant/build.xml
 .if ${ARCH} == powerpc64
 	@${REINPLACE_CMD} -e 's|amd64|ppc64|g' \
 		${WRKSRC}/platform_build/bsd_ant/build.xml
 .elif ${ARCH} == powerpc64le
 	@${REINPLACE_CMD} -e 's|amd64|ppc64le|g' \
 		${WRKSRC}/platform_build/bsd_ant/build.xml
 .endif
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 .for _jar in ${PLIST_FILES:M*.jar}
 	${INSTALL_DATA} ${WRKSRC}/libs/${_jar:T} \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 .endfor
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .if ${ARCH} == i386
 	${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .endif
 .if ${ARCH} == amd64 || ${ARCH:Mpowerpc64*}
 	${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so \
 		${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 .endif
 
 .include <bsd.port.post.mk>