Index: head/security/ngrok/Makefile
===================================================================
--- head/security/ngrok/Makefile
+++ head/security/ngrok/Makefile
@@ -2,15 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	ngrok
-PORTVERSION=	2.1.14
+PORTVERSION=	2.1.18
 CATEGORIES=	security
 MASTER_SITES=	https://bin.equinox.io/c/4VmDzA7iaHb/
-DISTNAME=	${PORTNAME}-stable-freebsd-${NGROK_ARCH}
+DISTNAME=	${PORTNAME}-stable-freebsd-${ARCH:S/i386/386/}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jhixson@gmail.com
 COMMENT=	Secure tunnels to localhost
 
+# run 'ngrok credits' for details
+LICENSE=	NONE APACHE20 BSD3CLAUSE CC0-1.0 LGPL3+ MIT
+LICENSE_COMB=	multi
+
 ONLY_FOR_ARCHS=	i386 amd64
 
 NO_WRKSUBDIR=	yes
@@ -19,18 +23,7 @@
 NO_BUILD=	yes
 USES=		zip
 
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "i386"
-NGROK_ARCH=	386
-.endif
-.if ${ARCH} == "amd64"
-NGROK_ARCH=	amd64
-.endif
-
-.include <bsd.port.pre.mk>
-
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/security/ngrok/distinfo
===================================================================
--- head/security/ngrok/distinfo
+++ head/security/ngrok/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1476370539
-SHA256 (ngrok/2.1.14/ngrok-stable-freebsd-amd64.zip) = 38058306073a6d2e970bc8ad9e9febe80fea6e1a20d106a46fd7ac9887e70e2a
-SIZE (ngrok/2.1.14/ngrok-stable-freebsd-amd64.zip) = 4688635
-SHA256 (ngrok/2.1.14/ngrok-stable-freebsd-386.zip) = 8202da2283cee9d62df26bced9f09dd6613ff712efd57599a02b79205c21f751
-SIZE (ngrok/2.1.14/ngrok-stable-freebsd-386.zip) = 4541544
+TIMESTAMP = 1480535311
+SHA256 (ngrok/2.1.18/ngrok-stable-freebsd-amd64.zip) = ef4d20b9c695f00e1d8113c776f9c1680f7ead9fa2c9a251ead5955a1bfca428
+SIZE (ngrok/2.1.18/ngrok-stable-freebsd-amd64.zip) = 5074462
+SHA256 (ngrok/2.1.18/ngrok-stable-freebsd-386.zip) = 27f05a6eda430f0767c804bb96e6dbe0dbe3b873a2933b0b2e97c1faaef830a2
+SIZE (ngrok/2.1.18/ngrok-stable-freebsd-386.zip) = 4901446
Index: head/security/ngrok/pkg-descr
===================================================================
--- head/security/ngrok/pkg-descr
+++ head/security/ngrok/pkg-descr
@@ -1,4 +1,4 @@
-Expose local servers behind NATs and firewalls to the public internet 
-over secure tunnels.
+Expose local servers behind NATs and firewalls to the public internet over
+secure tunnels.
 
-URL: https://ngrok.com
+WWW: https://ngrok.com/