Index: sysutils/fusefs-lkl/Makefile
===================================================================
--- sysutils/fusefs-lkl/Makefile
+++ sysutils/fusefs-lkl/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	lkl
-DISTVERSIONPREFIX=	v
-DISTVERSION=	4.8-493
-PORTREVISION=	4
-DISTVERSIONSUFFIX=	-g4b77c32b1a88
+DISTVERSION=	4.16.g20180612
+PORTREVISION=	0
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
@@ -14,16 +12,17 @@
 
 LICENSE=	GPLv2
 
-BROKEN=		inconsistent kallsyms data
+BUILD_DEPENDS=	gnubc>0:math/gnubc \
+		gnustat:sysutils/coreutils \
+		gsed:textproc/gsed
 
-BUILD_DEPENDS=	gnubc>0:math/gnubc
-
-USES=		fuse gmake python:build shebangfix
+USES=		bison:build fuse gmake python:build shebangfix
 SHEBANG_FILES=	../../arch/lkl/scripts/headers_install.py
 USE_BINUTILS=	yes
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_PROJECT=	linux
+GH_TAGNAME=	5e56fc93defeea368c48942fb589fcbe84af3b58
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=No one has added other architecture ld formats yet
@@ -31,7 +30,6 @@
 IGNORE_FreeBSD_10=	requires FreeBSD 11 or newer
 
 WRKSRC_SUBDIR=	tools/lkl
-ALL_TARGET=	lklfuse
 MAKE_JOBS_UNSAFE=yes
 MAKE_ARGS+=	V=1
 # Need ports versions of 'bc', 'ld' to build!
Index: sysutils/fusefs-lkl/distinfo
===================================================================
--- sysutils/fusefs-lkl/distinfo
+++ sysutils/fusefs-lkl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476438518
-SHA256 (lkl-linux-v4.8-493-g4b77c32b1a88_GH0.tar.gz) = 3b1adae23f1419a8b5c93d9c03bdca7b70df0b15285ab608b76cddb9285fbbba
-SIZE (lkl-linux-v4.8-493-g4b77c32b1a88_GH0.tar.gz) = 143222799
+TIMESTAMP = 1529814634
+SHA256 (lkl-linux-4.16.g20180612-5e56fc93defeea368c48942fb589fcbe84af3b58_GH0.tar.gz) = 60b9c0a2151a5ac69a56e1685e8f8c7c9178db2df80318b7799f40470247eea2
+SIZE (lkl-linux-4.16.g20180612-5e56fc93defeea368c48942fb589fcbe84af3b58_GH0.tar.gz) = 164256000
Index: sysutils/fusefs-lkl/files/patch-Makefile
===================================================================
--- sysutils/fusefs-lkl/files/patch-Makefile
+++ sysutils/fusefs-lkl/files/patch-Makefile
@@ -1,13 +1,15 @@
---- Makefile.orig	2016-08-16 21:09:03 UTC
+--- Makefile.orig	2018-06-12 22:43:19 UTC
 +++ Makefile
-@@ -121,8 +121,8 @@ endif
- 	$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=$(patsubst %/,%,$(dir $*)) obj=$(notdir $*)
+@@ -61,10 +61,10 @@ endif
  
- lib/lkl.o:
--	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) defconfig
--	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(CURDIR)
-+	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) defconfig
-+	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(CURDIR)
+ # rule to build lkl.o
+ $(OUTPUT)lib/lkl.o: bin/stat
+-	$(Q)$(MAKE) -C ../.. ARCH=lkl $(KOPT) $(KCONFIG)
++	$(Q)$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) $(KCONFIG)
+ # this workaround is for arm32 linker (ld.gold)
+ 	$(Q)export PATH=$(srctree)/tools/lkl/bin/:${PATH} ;\
+-	$(MAKE) -C ../.. ARCH=lkl $(KOPT) install INSTALL_PATH=$(OUTPUT)
++	$(MAKE) -C ../.. ARCH=lkl LDFLAGS= $(KOPT) install INSTALL_PATH=$(OUTPUT)
  
- liblkl.a: lib/lkl-in.o lib/lkl.o
- 	$(QUIET_AR)$(AR) -rc $@ $^
+ # rules to link libs
+ $(OUTPUT)%$(SOSUF): LDFLAGS += -shared
Index: sysutils/fusefs-lkl/files/patch-Targets
===================================================================
--- /dev/null
+++ sysutils/fusefs-lkl/files/patch-Targets
@@ -0,0 +1,18 @@
+--- Targets.orig	2018-06-12 22:43:19 UTC
++++ Targets
+@@ -10,15 +10,6 @@ LDLIBS_lib/hijack/liblkl-hijack-$(LKL_HOST_CONFIG_ANDR
+ progs-$(LKL_HOST_CONFIG_FUSE) += lklfuse
+ LDLIBS_lklfuse-y := -lfuse
+ 
+-progs-$(LKL_HOST_CONFIG_ARCHIVE) += fs2tar
+-LDLIBS_fs2tar-y := -larchive
+-LDLIBS_fs2tar-$(LKL_HOST_CONFIG_NEEDS_LARGP) += -largp
+-
+-
+-progs-$(LKL_HOST_CONFIG_ARCHIVE) += cptofs
+-LDLIBS_cptofs-y := -larchive
+-LDLIBS_cptofs-$(LKL_HOST_CONFIG_NEEDS_LARGP) += -largp
+-
+ progs-y += tests/boot
+ progs-y += tests/disk
+ progs-y += tests/net-test
Index: sysutils/fusefs-lkl/files/patch-lib_Build
===================================================================
--- sysutils/fusefs-lkl/files/patch-lib_Build
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Build.orig	2016-08-16 21:09:03 UTC
-+++ lib/Build
-@@ -13,8 +13,5 @@ lkl-y += dbg.o
- lkl-y += dbg_handler.o
- lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net.o
- lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_fd.o
--lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_tap.o
--lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_raw.o
--lkl-$(CONFIG_AUTO_LKL_POSIX_HOST) += virtio_net_macvtap.o
- lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_DPDK) += virtio_net_dpdk.o
- lkl-$(CONFIG_AUTO_LKL_VIRTIO_NET_VDE) += virtio_net_vde.o
Index: sysutils/fusefs-lkl/files/patch-scripts_headers__install.sh
===================================================================
--- /dev/null
+++ sysutils/fusefs-lkl/files/patch-scripts_headers__install.sh
@@ -0,0 +1,11 @@
+--- ../../scripts/headers_install.sh.orig	2018-06-12 18:43:19.000000000 -0400
++++ ../../scripts/headers_install.sh	2018-06-24 02:33:18.498200000 -0400
+@@ -31,7 +31,7 @@
+ for i in "$@"
+ do
+ 	FILE="$(basename "$i")"
+-	sed -r \
++	gsed -r \
+ 		-e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
+ 		-e 's/__attribute_const__([ \t]|$)/\1/g' \
+ 		-e 's@^#include <linux/compiler(|_types).h>@@' \
Index: sysutils/fusefs-lkl/files/patch-scripts_link-vmlinux.sh
===================================================================
--- /dev/null
+++ sysutils/fusefs-lkl/files/patch-scripts_link-vmlinux.sh
@@ -0,0 +1,13 @@
+--- ../../scripts/link-vmlinux.sh.orig	2018-06-12 18:43:19.000000000 -0400
++++ ../../scripts/link-vmlinux.sh	2018-06-24 02:08:26.495593000 -0400
+@@ -302,8 +302,8 @@
+ 	kallsyms .tmp_vmlinux2 .tmp_kallsyms2.o
+ 
+ 	# step 3
+-	size1=$(stat -c "%s" .tmp_kallsyms1.o)
+-	size2=$(stat -c "%s" .tmp_kallsyms2.o)
++	size1=$(gnustat -c "%s" .tmp_kallsyms1.o)
++	size2=$(gnustat -c "%s" .tmp_kallsyms2.o)
+ 
+ 	if [ $size1 -ne $size2 ] || [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
+ 		kallsymso=.tmp_kallsyms3.o