diff --git c/benchmarks/wrk/Makefile w/benchmarks/wrk/Makefile
index 0adf73f547af..cd041d3cc97e 100644
--- c/benchmarks/wrk/Makefile
+++ w/benchmarks/wrk/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wrk
-PORTVERSION=	4.0.2
-PORTREVISION=	1
+PORTVERSION=	4.1.0
 CATEGORIES=	benchmarks www
 
 MAINTAINER=	osa@FreeBSD.org
@@ -17,8 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	wg
 
 USES=		gmake ssl
-LLD_UNSAFE=	yes
-CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MATH
+CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MATH -I${LOCALBASE}/include/luajit-2.1
 MAKE_ENV+=	WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
 
 PLIST_FILES=	bin/wrk
diff --git c/benchmarks/wrk/distinfo w/benchmarks/wrk/distinfo
index 9729ffe00688..fdcaf791c0cd 100644
--- c/benchmarks/wrk/distinfo
+++ w/benchmarks/wrk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (wg-wrk-4.0.2_GH0.tar.gz) = a4a6ad6727733023771163e7250189a9a23e6253b5e5025191baa6092d5a26fb
-SIZE (wg-wrk-4.0.2_GH0.tar.gz) = 6146798
+TIMESTAMP = 1520792809
+SHA256 (wg-wrk-4.1.0_GH0.tar.gz) = 6fa1020494de8c337913fd139d7aa1acb9a020de6f7eb9190753aa4b1e74271e
+SIZE (wg-wrk-4.1.0_GH0.tar.gz) = 6478125
diff --git c/databases/redis-devel/Makefile w/databases/redis-devel/Makefile
index 4f0e15504460..813ee5c13c7a 100644
--- c/databases/redis-devel/Makefile
+++ w/databases/redis-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	redis
 DISTVERSION=	4.0.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 PKGNAMESUFFIX=	-devel
diff --git c/databases/redis-devel/files/extra-patch-src-Makefile.luajit w/databases/redis-devel/files/extra-patch-src-Makefile.luajit
index 48da60aa531d..cdbaee120c75 100644
--- c/databases/redis-devel/files/extra-patch-src-Makefile.luajit
+++ w/databases/redis-devel/files/extra-patch-src-Makefile.luajit
@@ -33,7 +33,7 @@
  	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
  endif
  
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
++FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
 +FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
 +
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git c/databases/redis/Makefile w/databases/redis/Makefile
index 19536142d04c..d828557b4b4e 100644
--- c/databases/redis/Makefile
+++ w/databases/redis/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	redis
 DISTVERSION=	3.2.11
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 
diff --git c/databases/redis/files/extra-patch-src-Makefile.luajit w/databases/redis/files/extra-patch-src-Makefile.luajit
index 9b9c5f598fe1..1c495ea9432f 100644
--- c/databases/redis/files/extra-patch-src-Makefile.luajit
+++ w/databases/redis/files/extra-patch-src-Makefile.luajit
@@ -24,7 +24,7 @@
  	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
  endif
  
-+FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0
++FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.1
 +FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
 +
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git c/devel/love/Makefile w/devel/love/Makefile
index da8a472d58fb..605dc74589a7 100644
--- c/devel/love/Makefile
+++ w/devel/love/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	love
 PORTVERSION=	0.10.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel games
 MASTER_SITES=	https://bitbucket.org/rude/love/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
@@ -45,6 +45,10 @@ LUAJIT_CONFIGURE_OFF=	--with-lua=lua \
 			--with-luaversion="${LUA_VER}"
 LUAJIT_CONFIGURE_ENV_OFF=LUA_EXECUTABLE="${LUA_CMD}"
 
+post-patch:
+	@${REINPLACE_CMD} -e 's| luaL_reg| luaL_Reg|' \
+		${WRKSRC}/src/libraries/luasocket/libluasocket/*
+
 post-patch-LUAJIT-off:
 	@${REINPLACE_CMD} -e 's|$${with_lua}$${with_luaversion}|$${with_lua}-$${with_luaversion}|g' \
 		${WRKSRC}/configure
diff --git c/devel/lua-luarocks/Makefile w/devel/lua-luarocks/Makefile
index 3cea3cfb9a16..fd773d0519ab 100644
--- c/devel/lua-luarocks/Makefile
+++ w/devel/lua-luarocks/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	luarocks
 PORTVERSION=	2.4.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
@@ -34,7 +35,7 @@ LUAJIT_RUN_DEPENDS=	luajit:lang/luajit
 LUAJIT_CONFIGURE_ON=	--lua-suffix=jit
 LUAJIT_PLIST_SUB=	LUA_VER=${LUA_VER} \
 			LUA_MODSHAREDIR=share/lua/${LUA_VER}
-LUAJIT_VARS=		LUA_INCDIR=${LOCALBASE}/include/luajit-2.0 \
+LUAJIT_VARS=		LUA_INCDIR=${LOCALBASE}/include/luajit-2.1 \
 			LUA_VER=5.1 LUA_PKGNAMEPREFIX=lua51-
 LUAJIT_USES_OFF=	lua
 
diff --git c/games/naev/Makefile w/games/naev/Makefile
index c794b4c1656c..25574b3bbc2f 100644
--- c/games/naev/Makefile
+++ w/games/naev/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	naev
 PORTVERSION=	0.7.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
@@ -73,4 +73,8 @@ USE_SDL+=	mixer
 .	endif
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|const luaL_reg|const luaL_Reg|' \
+		${WRKSRC}/src/*.c
+
 .include <bsd.port.post.mk>
diff --git c/lang/luajit/Makefile w/lang/luajit/Makefile
index 940f05536427..68f82e52964b 100644
--- c/lang/luajit/Makefile
+++ w/lang/luajit/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	luajit
-DISTVERSION=	2.0.5
-PORTREVISION=	1
+DISTVERSION=	2.1.0-beta3
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
 DISTNAME=	LuaJIT-${DISTVERSION}
@@ -16,9 +15,15 @@ USES=		gmake
 USE_LDCONFIG=	yes
 MAKE_ARGS=	CC=${CC}
 
-PLIST_SUB+=	VERSION=${DISTVERSION}
+PLIST_SUB+=	VERSION=${DISTVERSION} LIBVERSION=${DISTVERSION:C/-.*//}
 BROKEN_powerpc64=	Not ported to powerpc64 upstream
 
+OPTIONS_DEFINE=		PTHREAD
+OPTIONS_DEFAULT=	PTHREAD
+
+PTHREAD_DESC=		Enable pthread support
+PTHREAD_LDFLAGS=	-lm -pthread
+
 .include <bsd.port.options.mk>
 
 .if ${ARCH:Mpowerpc*} || ${ARCH:Mmips*} || ${ARCH:Msparc*}
@@ -28,6 +33,6 @@ USE_GCC=yes
 post-install:
 	${LN} -sf ${PORTNAME}-${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	@${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git c/lang/luajit/distinfo w/lang/luajit/distinfo
index 45e239a1956f..fe9833cce56f 100644
--- c/lang/luajit/distinfo
+++ w/lang/luajit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493823315
-SHA256 (LuaJIT-2.0.5.tar.gz) = 874b1f8297c697821f561f9b73b57ffd419ed8f4278c82e05b48806d30c1e979
-SIZE (LuaJIT-2.0.5.tar.gz) = 849845
+TIMESTAMP = 1516470480
+SHA256 (LuaJIT-2.1.0-beta3.tar.gz) = 1ad2e34b111c802f9d0cdf019e986909123237a28c746b21295b63c9e785d9c3
+SIZE (LuaJIT-2.1.0-beta3.tar.gz) = 1025180
diff --git c/lang/luajit/files/patch-src_Makefile w/lang/luajit/files/patch-src_Makefile
index a8a8e81b3ae8..a0956504cf5f 100644
--- c/lang/luajit/files/patch-src_Makefile
+++ w/lang/luajit/files/patch-src_Makefile
@@ -22,8 +22,8 @@
  # x86/x64 only: For GCC 4.2 or higher and if you don't intend to distribute
  # the binaries to a different machine you could also use: -march=native
  #
--CCOPT_x86= -march=i686
-+#CCOPT_x86= -march=i686
+-CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
++#CCOPT_x86= -march=i686 -msse -msse2 -mfpmath=sse
  CCOPT_x64=
  CCOPT_arm=
  CCOPT_ppc=
diff --git c/lang/luajit/pkg-plist w/lang/luajit/pkg-plist
index 3c66297b6019..af239e734e0d 100644
--- c/lang/luajit/pkg-plist
+++ w/lang/luajit/pkg-plist
@@ -1,25 +1,31 @@
 bin/luajit
 bin/luajit-%%VERSION%%
-include/luajit-2.0/lauxlib.h
-include/luajit-2.0/lua.h
-include/luajit-2.0/lua.hpp
-include/luajit-2.0/luaconf.h
-include/luajit-2.0/luajit.h
-include/luajit-2.0/lualib.h
+include/luajit-2.1/lauxlib.h
+include/luajit-2.1/lua.h
+include/luajit-2.1/lua.hpp
+include/luajit-2.1/luaconf.h
+include/luajit-2.1/luajit.h
+include/luajit-2.1/lualib.h
 lib/libluajit-5.1.a
 lib/libluajit-5.1.so
 lib/libluajit-5.1.so.2
-lib/libluajit-5.1.so.%%VERSION%%
+lib/libluajit-5.1.so.%%LIBVERSION%%
 libdata/pkgconfig/luajit.pc
 share/luajit-%%VERSION%%/jit/bc.lua
 share/luajit-%%VERSION%%/jit/bcsave.lua
 share/luajit-%%VERSION%%/jit/dis_arm.lua
+share/luajit-%%VERSION%%/jit/dis_arm64.lua
+share/luajit-%%VERSION%%/jit/dis_arm64be.lua
 share/luajit-%%VERSION%%/jit/dis_mips.lua
+share/luajit-%%VERSION%%/jit/dis_mips64.lua
+share/luajit-%%VERSION%%/jit/dis_mips64el.lua
 share/luajit-%%VERSION%%/jit/dis_mipsel.lua
 share/luajit-%%VERSION%%/jit/dis_ppc.lua
 share/luajit-%%VERSION%%/jit/dis_x64.lua
 share/luajit-%%VERSION%%/jit/dis_x86.lua
 share/luajit-%%VERSION%%/jit/dump.lua
+share/luajit-%%VERSION%%/jit/p.lua
 share/luajit-%%VERSION%%/jit/v.lua
 share/luajit-%%VERSION%%/jit/vmdef.lua
+share/luajit-%%VERSION%%/jit/zone.lua
 man/man1/luajit.1.gz
diff --git c/www/nginx-devel/Makefile w/www/nginx-devel/Makefile
index 00ab2a13d17a..0b653f7fa6d8 100644
--- c/www/nginx-devel/Makefile
+++ w/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.13.9
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -853,7 +854,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 
 .if ${PORT_OPTIONS:MLUA}
 LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
-CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
+CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.1"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	0.10.11
 GH_ACCOUNT+=	openresty:lua
diff --git c/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure w/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
index 418fa7fa50c5..3419ff760ca8 100644
--- c/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
+++ w/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
@@ -14,7 +14,7 @@
      test_paths= ;; #(
    yes) :
 -    test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(
-+    test_paths="%%PREFIX%%/include/luajit-2.0" ;; #(
++    test_paths="%%PREFIX%%/include/luajit-2.1" ;; #(
    *) :
      test_paths="${with_lua}" ;;
  esac
diff --git c/www/nginx/Makefile w/www/nginx/Makefile
index 556ee8ab6706..2605c8fefd7f 100644
--- c/www/nginx/Makefile
+++ w/www/nginx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.12.2
-PORTREVISION?=	10
+PORTREVISION?=	11
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
@@ -862,7 +862,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_let}
 
 .if ${PORT_OPTIONS:MLUA}
 LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
-CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.0"
+CONFIGURE_ENV+=	"LUAJIT_INC=${LOCALBASE}/include/luajit-2.1"
 CONFIGURE_ENV+=	"LUAJIT_LIB=${LOCALBASE}/lib"
 NGINX_LUA_VERSION=	0.10.11
 GH_ACCOUNT+=	openresty:lua
diff --git c/www/nginx/files/extra-patch-nginx-modsecurity-configure w/www/nginx/files/extra-patch-nginx-modsecurity-configure
index 09a6255f75b5..27cf3a3e4b29 100644
--- c/www/nginx/files/extra-patch-nginx-modsecurity-configure
+++ w/www/nginx/files/extra-patch-nginx-modsecurity-configure
@@ -14,7 +14,7 @@
      test_paths= ;; #(
    yes) :
 -    test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #(
-+    test_paths="%%PREFIX%%/include/luajit-2.0" ;; #(
++    test_paths="%%PREFIX%%/include/luajit-2.1" ;; #(
    *) :
      test_paths="${with_lua}" ;;
  esac