diff --git a/games/naev-data/Makefile b/games/naev-data/Makefile
index 2bf0ba9a5b0a..bda3781c02e1 100644
--- a/games/naev-data/Makefile
+++ b/games/naev-data/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	naev
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7.0
+DISTVERSIONSUFFIX=	-ndata
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 PKGNAMESUFFIX=	-data
-DISTNAME=	ndata-${PORTVERSION}
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	acm@FreeBSD.org
diff --git a/games/naev-data/distinfo b/games/naev-data/distinfo
index 5059028eb1bf..9ed6de246f93 100644
--- a/games/naev-data/distinfo
+++ b/games/naev-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ndata-0.6.1.zip) = 3d7c807637f3f4795db0aab29f02a76ee25398ecb53208f08a60be1197a86996
-SIZE (ndata-0.6.1.zip) = 303984255
+TIMESTAMP = 1501801746
+SHA256 (naev-0.7.0-ndata.zip) = 98039d0c4f671128a1b8fba7937f2e8d272dc71322f42c18778fc1a89f45f295
+SIZE (naev-0.7.0-ndata.zip) = 319608404
diff --git a/games/naev/Makefile b/games/naev/Makefile
index a8e10ebab5e1..5a7b5abf1e04 100644
--- a/games/naev/Makefile
+++ b/games/naev/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	naev
-PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTVERSION=	0.7.0
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
@@ -18,14 +17,14 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libvorbisfile.so:audio/libvorbis \
 		libzip.so:archivers/libzip \
 		libcsparse.so:math/suitesparse
-RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/ndata-${PORTVERSION}.zip:games/naev-data
+RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/${DISTNAME}-ndata.zip:games/naev-data
 
 USES=		autoreconf:build compiler:features gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-USE_GL=		glu
+USE_GL=		gl glu
 USE_GNOME=	libxml2
 
-CONFIGURE_ARGS=	--with-ndata-path="${DATADIR}/ndata-${PORTVERSION}.zip" \
+CONFIGURE_ARGS=	--with-ndata-path="${DATADIR}/${DISTNAME}-ndata.zip" \
 		--enable-debug=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm
@@ -33,14 +32,23 @@ LIBS+=		-L${LOCALBASE}/lib -lm
 PORTDATA=	*
 PORTDOCS=	*
 
-PLIST_FILES=	bin/${PORTNAME} man/man6/naev.6.gz \
+PLIST_FILES=	bin/${PORTNAME} man/man6/${PORTNAME}.6.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/appdata/${PORTNAME}.appdata.xml \
 		share/pixmaps/${PORTNAME}.png
 
 OPTIONS_DEFINE=	DOCS OPENAL SDL2 SDL_MIXER
-OPTIONS_DEFAULT=	OPENAL SDL2 SDL_MIXER
+OPTIONS_DEFAULT=	LUA_JIT OPENAL SDL2 SDL_MIXER
+OPTIONS_SINGLE=		LUA
+OPTIONS_SINGLE_LUA=	LUA_INTERNAL LUA_SHARED LUA_JIT
 
+LUA_INTERNAL_DESC=	Use bundled Lua
+LUA_INTERNAL_CONFIGURE_ON=	--enable-lua=internal
+LUA_SHARED_DESC=	Use Lua from lang/lua51
+LUA_SHARED_CONFIGURE_ON=	--enable-lua=shared
+LUA_SHARED_USES=	lua:51
+LUA_JIT_DESC=		Use LuaJIT from lang/luajit
+LUA_JIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 OPENAL_USES=	openal
 OPENAL_CONFIGURE_WITH=	openal
 SDL_MIXER_DESC=	SDL_mixer sound backend
diff --git a/games/naev/distinfo b/games/naev/distinfo
index 4cfc89ed513c..2f397e2a8a66 100644
--- a/games/naev/distinfo
+++ b/games/naev/distinfo
@@ -1,2 +1,3 @@
-SHA256 (naev-0.6.1.tar.bz2) = 71d4cf06d2af1a1b84dfb9ed0fd5e4b9b2295f119fc65079d8d36f102ba00b4b
-SIZE (naev-0.6.1.tar.bz2) = 1047908
+TIMESTAMP = 1501802079
+SHA256 (naev-0.7.0.tar.bz2) = 30c1ea58ce0b314048d629df196b2eec908a627f9c98395b0fc95417305b008a
+SIZE (naev-0.7.0.tar.bz2) = 1076658