diff --git a/security/lua-sec/Makefile b/security/lua-sec/Makefile
index 397e3187c0bdf..2fa7e68257f88 100644
--- a/security/lua-sec/Makefile
+++ b/security/lua-sec/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2016/03/05 11:29:22 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2016/06/04 21:48:11 alnsn Exp $
 
-DISTNAME=		luasec-0.5
-PKGNAME=		${LUA_PKGPREFIX}-${DISTNAME:S/lua//}
-PKGREVISION=		4
+DISTNAME=		luasec-0.6
+PKGNAME=		${DISTNAME:S/luasec/${LUA_PKGPREFIX}-sec/}
 CATEGORIES=		security
-MASTER_SITES=		https://github.com/brunoos/luasec/archive/
+MASTER_SITES=		${MASTER_SITE_GITHUB:=brunoos/}
+GITHUB_TAG=		${DISTNAME}
+GITHUB_PROJECT=		${DISTNAME:S/-${PKGVERSION_NOREV}//}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		https://github.com/brunoos/luasec/
diff --git a/security/lua-sec/distinfo b/security/lua-sec/distinfo
index 43850fccbbbe4..a5983701fdbca 100644
--- a/security/lua-sec/distinfo
+++ b/security/lua-sec/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:17:50 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/06/04 21:48:11 alnsn Exp $
 
-SHA1 (luasec-0.5.tar.gz) = bcfe8fda66b6058d07031df3c4a20f6192cf3e73
-RMD160 (luasec-0.5.tar.gz) = a9ef4591a770e178718e24778386136cdc87cadf
-SHA512 (luasec-0.5.tar.gz) = fcf88f2566952c4d12be95531991180a1f3bd60f7dda41997f93c80ccc8d9dfd44b00e3330a07e451489dc9cd0640f7841101c10867e270608187df78549fe2f
-Size (luasec-0.5.tar.gz) = 46738 bytes
-SHA1 (patch-aa) = 364c0e6ee5c4c04ca7c9cb8a70129013289e9df9
-SHA1 (patch-ab) = 3cd9916a098d3f0f77bbb58eab9841021049e2f3
+SHA1 (luasec-0.6.tar.gz) = 3204c0ac99f7be1952ad8f1157e83cc513491cb4
+RMD160 (luasec-0.6.tar.gz) = fc34ead1ec17b42991f8599f888007ab677dc6af
+SHA512 (luasec-0.6.tar.gz) = f7004a329153d0126a3ea27b4986e9d83fb8f2de9c5c2f0c96427c50cc42e1252c69fd8cc69e2e8d423745d2dbfdb5a781b609938f7f502c7aedeb99fd0778cd
+Size (luasec-0.6.tar.gz) = 51071 bytes
+SHA1 (patch-Makefile) = 17ae13eecf9ce9269e8ef9a826507bd6230c3364
+SHA1 (patch-src_Makefile) = c29625c3fd30cca14138867141586250487b2205
diff --git a/security/lua-sec/patches/patch-aa b/security/lua-sec/patches/patch-Makefile
similarity index 78%
rename from security/lua-sec/patches/patch-aa
rename to security/lua-sec/patches/patch-Makefile
index 8cb4ed4eaa349..c76e1a02e2485 100644
--- a/security/lua-sec/patches/patch-aa
+++ b/security/lua-sec/patches/patch-Makefile
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.4 2014/04/07 20:14:48 fhajny Exp $
+$NetBSD: patch-Makefile,v 1.1 2016/06/04 21:48:12 alnsn Exp $
 
-Pass installation dirs properly, fix search paths, add Solaris support
+Pass installation dirs properly, fix search paths, add Solaris support.
 
---- Makefile.orig	2014-01-29 20:43:33.000000000 +0000
+--- Makefile.orig	2016-03-03 19:11:46.000000000 +0000
 +++ Makefile
-@@ -6,7 +6,7 @@ LUACPATH	?= /usr/lib/lua/5.1
+@@ -6,7 +6,7 @@ LUACPATH ?= /usr/lib/lua/5.1
  # Comment this lines if you will link with non-internal LuaSocket's help files
  #  and edit INCDIR and LIBDIR properly.
- EXTRA		 = luasocket
--DEFS		 = -DWITH_LUASOCKET
-+DEFS		 = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE
+ EXTRA = luasocket
+-DEFS  = -DWITH_LUASOCKET
++DEFS  = -DWITH_LUASOCKET -DLUA_COMPAT_MODULE
  
  # Edit the lines below to inform new path, if necessary.
  # Path below points to internal LuaSocket's help files.
diff --git a/security/lua-sec/patches/patch-ab b/security/lua-sec/patches/patch-src_Makefile
similarity index 72%
rename from security/lua-sec/patches/patch-ab
rename to security/lua-sec/patches/patch-src_Makefile
index 6814a8e54ff16..ae144780bdb87 100644
--- a/security/lua-sec/patches/patch-ab
+++ b/security/lua-sec/patches/patch-src_Makefile
@@ -1,7 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2014/04/16 14:07:50 fhajny Exp $
+$NetBSD: patch-src_Makefile,v 1.1 2016/06/04 21:48:12 alnsn Exp $
 
 Pass proper libs for SunOS.
---- src/Makefile.orig	2014-01-29 20:43:33.000000000 +0000
+
+--- src/Makefile.orig	2016-03-03 19:11:46.000000000 +0000
 +++ src/Makefile
 @@ -6,7 +6,7 @@ OBJS= \
   context.o \
@@ -19,17 +20,17 @@ Pass proper libs for SunOS.
 +SOL_CFLAGS=-O2 -fpic $(WARN) $(INCDIR) $(DEFS)
 +SOL_LDFLAGS=-O -shared -fpic $(LIBDIR)
 +
- INSTALL	?= install
- CC	?= cc
- LD	?= $(MYENV) cc
-@@ -32,10 +35,11 @@ DESTDIR	?= /
+ INSTALL  = install
+ CC       = cc
+ LD       = $(MYENV) cc
+@@ -31,10 +34,11 @@ LDFLAGS += $(MYLDFLAGS)
  all:
  
  install: $(CMOD) $(LMOD)
--	$(INSTALL) -d $(DESTDIR)$(LUAPATH)/ssl $(DESTDIR)$(LUACPATH)
--	$(INSTALL) -D $(CMOD) $(DESTDIR)$(LUACPATH)
--	$(INSTALL) -m644 -D $(LMOD) $(DESTDIR)$(LUAPATH)
--	$(INSTALL) -m644 -D https.lua $(DESTDIR)$(LUAPATH)/ssl
+-	$(INSTALL) -d $(LUAPATH)/ssl $(LUACPATH)
+-	$(INSTALL) $(CMOD) $(LUACPATH)
+-	$(INSTALL) -m644 $(LMOD) $(LUAPATH)
+-	$(INSTALL) -m644 https.lua $(LUAPATH)/ssl
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(LUAPATH)/ssl
 +	$(BSD_INSTALL_LIB_DIR)  $(DESTDIR)$(LUACPATH)
 +	$(BSD_INSTALL_LIB) $(CMOD) $(DESTDIR)$(LUACPATH)
@@ -38,7 +39,7 @@ Pass proper libs for SunOS.
  
  linux:
  	@$(MAKE) $(CMOD) MYCFLAGS="$(LNX_CFLAGS)" MYLDFLAGS="$(LNX_LDFLAGS)" EXTRA="$(EXTRA)"
-@@ -46,6 +50,9 @@ bsd:
+@@ -45,6 +49,9 @@ bsd:
  macosx:
  	@$(MAKE) $(CMOD) MYCFLAGS="$(MAC_CFLAGS)" MYLDFLAGS="$(MAC_LDFLAGS)" MYENV="$(MAC_ENV)" EXTRA="$(EXTRA)"