--- Makefile	(revision 350025)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	prosody
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	net-im
 MASTER_SITES=	http://prosody.im/downloads/source/ \
 				http://redundancy.redundancy.org/mirror/
@@ -25,15 +25,25 @@ 
 USE_RC_SUBR=	prosody
 MANCOMPRESSED=	no
 
-USES=	gmake shebangfix
+OPTIONS_DEFINE= LUAJIT
+LUAJIT_DESC=    Run prosody using luajit
+LUAJIT_LIB_DEPENDS=     libluajit-5.1.so:${PORTSDIR}/lang/luajit
+
+.include <bsd.port.options.mk>
+
+USES=		gmake
 USE_LUA=	5.1
 WANT_LUA_VER=	5.1
-SHEBANG_LANG=	lua
-SHEBANG_FILES=	prosody prosodyctl
-lua_OLD_CMD=	${SETENV} lua
-lua_CMD=	${LUA_CMD}
+LUA_PREMK=	yes
 
+.include <bsd.port.pre.mk>
+
 HAS_CONFIGURE=	yes
+.if ${PORT_OPTIONS:MLUAJIT}
+CONFIGURE_ARGS+= --runwith=`which luajit`
+.else
+CONFIGURE_ARGS+= --runwith=`which ${LUA_CMD}`
+.endif
 CONFIGURE_ARGS+=	--ostype=freebsd --c-compiler="${CC}" --linker="${LD}"
 CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
 
@@ -41,4 +51,4 @@ 
 SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
 PLIST_SUB=	PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- distinfo	(revision 350025)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (prosody-0.9.3.tar.gz) = 22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0
-SIZE (prosody-0.9.3.tar.gz) = 264318
+SHA256 (prosody-0.9.4.tar.gz) = be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6
+SIZE (prosody-0.9.4.tar.gz) = 265898