diff --git a/net/haproxy-devel/Makefile b/net/haproxy-devel/Makefile
index 119e30ddd117..c40dff158c8b 100644
--- a/net/haproxy-devel/Makefile
+++ b/net/haproxy-devel/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	haproxy
-DISTVERSION=	1.5.0
+DISTVERSION=	1.6-dev1
 CATEGORIES=	net www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.5/src/
+MASTER_SITES=	http://haproxy.1wt.eu/download/1.6/src/devel/
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	demon@FreeBSD.org
@@ -13,14 +13,12 @@ COMMENT=	The Reliable, High Performance TCP/HTTP Load Balancer
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
-IGNORE=		No devel version available at this time
-
 USES=		cpe gmake
 CONFLICTS=	haproxy-[1234567890]\*
 USE_RC_SUBR=	haproxy
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DOCS EXAMPLES OPENSSL
+OPTIONS_DEFINE=		DOCS EXAMPLES LUA OPENSSL
 OPTIONS_RADIO=		PCRE
 OPTIONS_RADIO_PCRE=	DPCRE SPCRE
 DPCRE_DESC=		Link dynamically
@@ -46,6 +44,11 @@ USE_OPENSSL=	yes
 MAKE_ARGS+=	USE_OPENSSL=1
 .endif
 
+.if ${PORT_OPTIONS:MLUA}
+USES+=		lua:53
+MAKE_ARGS+=	USE_LUA=1 LUA_INC=${LUA_INCDIR} LUA_LIB=${LUA_LIBDIR} LUA_LIB_NAME=lua-${LUA_VER}
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/haproxy ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_MAN} ${WRKSRC}/doc/haproxy.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
diff --git a/net/haproxy-devel/distinfo b/net/haproxy-devel/distinfo
index 31e22a48f33c..f2f80dca9137 100644
--- a/net/haproxy-devel/distinfo
+++ b/net/haproxy-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (haproxy-1.5.0.tar.gz) = 6d375b9d762edd371fcb05af63d320bbdc9f9bdcdb366b43ca69b93c655ac19c
-SIZE (haproxy-1.5.0.tar.gz) = 1329040
+SHA256 (haproxy-1.6-dev1.tar.gz) = 872d102865f76c10d24652be06767f3da526d93db28f1eeb37bd2b1ddf1d085e
+SIZE (haproxy-1.6-dev1.tar.gz) = 1457137
diff --git a/net/haproxy-devel/files/pkg-message.in b/net/haproxy-devel/files/pkg-message.in
deleted file mode 100644
index c753a18773e6..000000000000
--- a/net/haproxy-devel/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-************************************************
-*  THIS IS THE DEVELOPMENT BRANCH OF HAPROXY!  *
-************************************************
-
-Please use the main port (net/haproxy) for the
-stable branch of haproxy for general production
-use of the software.
-
-Check the following directories for further info:
-  documentation:  '%%DOCSDIR%%'   
-  examples:       '%%EXAMPLESDIR%%'
-
-rc.conf variables listing can be found in:
-  '%%PREFIX%%/etc/rc.d/haproxy'
-
diff --git a/net/haproxy-devel/pkg-plist b/net/haproxy-devel/pkg-plist
index b1738b5df334..7dd5a3feb3ea 100644
--- a/net/haproxy-devel/pkg-plist
+++ b/net/haproxy-devel/pkg-plist
@@ -53,6 +53,12 @@ sbin/haproxy
 %%PORTDOCS%%%%DOCSDIR%%/internals/stats-v2.txt
 %%PORTDOCS%%%%DOCSDIR%%/internals/stream-sock-states.fig
 %%PORTDOCS%%%%DOCSDIR%%/internals/todo.cttproxy
+%%PORTDOCS%%%%DOCSDIR%%/lua-api/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.fig
+%%PORTDOCS%%%%DOCSDIR%%/lua-api/_static/channel.png
+%%PORTDOCS%%%%DOCSDIR%%/lua-api/conf.py
+%%PORTDOCS%%%%DOCSDIR%%/lua-api/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/network-namespaces.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/acl-content-sw.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/auth.cfg
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/build.cfg