diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 147149c48a37..e04cc6fd96ce 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	i3
-DISTVERSION=	4.16
+DISTVERSION=	4.16.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/
 
@@ -10,29 +10,30 @@ MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Improved dynamic tiling window manager
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
-		libxcb-util.so:x11/xcb-util \
-		libxcb-keysyms.so:x11/xcb-util-keysyms \
-		libxcb-icccm.so:x11/xcb-util-wm \
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
 		libev.so:devel/libev \
-		libyajl.so:devel/yajl \
-		libcairo.so:graphics/cairo \
 		libpangocairo-1.0.so:x11-toolkits/pango \
 		libpcre.so:devel/pcre \
+		libstartup-notification-1.so:x11/startup-notification \
 		libxcb-cursor.so:x11/xcb-util-cursor \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-util.so:x11/xcb-util \
+		libxcb-xrm.so:x11/xcb-util-xrm \
 		libxkbcommon.so:x11/libxkbcommon \
-		libxcb-xrm.so:x11/xcb-util-xrm
-RUN_DEPENDS=	p5-IPC-Run>=0:devel/p5-IPC-Run \
-		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
-		p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3
+		libyajl.so:devel/yajl
+RUN_DEPENDS=	p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3 \
+		p5-IPC-Run>=0:devel/p5-IPC-Run \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny
 
-USES=		compiler:c11 pkgconfig gmake iconv perl5 tar:bzip2
+USES=		compiler:c11 gmake iconv localbase perl5 pkgconfig tar:bzip2
 USE_XORG=	xcb
 GNU_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ENV=	ac_cv_path_PATH_ASCIIDOC=""
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+LDFLAGS+=	${ICONV_LIB}
 INSTALL_TARGET=	install-strip
 
 CONFLICTS_INSTALL=	i3-gaps
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index 21ee5eebde2b..47aee36b5a7b 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541408929
-SHA256 (i3-4.16.tar.bz2) = cc60a5f518c5e37b4143b644a840bb2ad2a63ea7a771954c332cd5637db655b4
-SIZE (i3-4.16.tar.bz2) = 1213251
+TIMESTAMP = 1548752186
+SHA256 (i3-4.16.1.tar.bz2) = ab65c25c06acbdc67cba3ff23e2a82ea17911def65f4fd0200bb6f9382378576
+SIZE (i3-4.16.1.tar.bz2) = 1211532