diff --git a/misc/rump/Makefile b/misc/rump/Makefile
index eaf99b332bf8..b2e2b8ae95b3 100644
--- a/misc/rump/Makefile
+++ b/misc/rump/Makefile
@@ -1,46 +1,46 @@
 PORTNAME=	rump
 PORTVERSION=	20170822
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Virtualized NetBSD kernel components in userspace
 WWW=		https://www.rumpkernel.org
 
 LICENSE=	BSD2CLAUSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 ONLY_FOR_ARCHS_REASON=	only supports FreeBSD on this architecture
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rumpkernel
 GH_PROJECT=	buildrump.sh
 GH_TAGNAME=	b914579
 GH_TUPLE=	rumpkernel:src-netbsd:82f3a69:netbsd/src
 USE_LDCONFIG=	yes
 USES=		compiler
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=strict-prototypes -Wno-error=array-parameter
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	X8664=""
 .else
 PLIST_SUB+=	X8664="@comment "
 .endif
 
 CWARNFLAGS+=	-Wno-address-of-packed-member
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 130
 CWARNFLAGS+=	-Wno-unused-but-set-variable
 .endif
 
 do-build:
 	cd ${WRKSRC}; ${SETENV} CC=${CC} AR=${AR} NM=${NM} OBJCOPY=${OBJCOPY} ./buildrump.sh -F CFLAGS="${CFLAGS}" -F CWARNFLAGS="${CWARNFLAGS}" -r fullbuild
 
 do-install:
 	cd ${WRKSRC}/rump; ${PAX} -wr lib include ${STAGEDIR}${PREFIX}/
 
 .include <bsd.port.post.mk>
diff --git a/misc/rump/files/patch-buildrump.sh b/misc/rump/files/patch-buildrump.sh
index e07922b0f0ee..6b95af68f011 100644
--- a/misc/rump/files/patch-buildrump.sh
+++ b/misc/rump/files/patch-buildrump.sh
@@ -1,29 +1,37 @@
 --- buildrump.sh.orig	2017-03-28 02:35:28 UTC
 +++ buildrump.sh
 @@ -177,6 +177,9 @@ probeld ()
  	elif echo ${linkervers} | grep -q 'GNU gold' ; then
  		LD_FLAVOR=gold
  		LD_AS_NEEDED='-Wl,--no-as-needed'
 +	elif echo ${linkervers} | grep -q 'LLD' ; then
 +		LD_FLAVOR=GNU
 +		LD_AS_NEEDED='-Wl,--no-as-needed'
  	elif echo ${linkervers} | grep -q 'Solaris Link Editor' ; then
  		LD_FLAVOR=sun
  		SHLIB_MKMAP=no
-@@ -788,6 +791,8 @@ makebuild ()
+@@ -511,7 +514,6 @@ maketools ()
+ 
+ 	probeld
+ 	probenm
+-	probear
+ 	${HAVECXX} && probecxx
+ 
+ 	cd ${OBJDIR}
+@@ -788,6 +790,8 @@ makebuild ()
  	     -o ${MACHINE#evbearm} != ${MACHINE} \
  	     -o ${MACHINE#evbppc} != ${MACHINE} ]; then
  		DIRS_emul=sys/rump/kern/lib/libsys_linux
 +	else
 +		DIRS_emul=
  	fi
  	${SYS_SUNOS} && appendvar DIRS_emul sys/rump/kern/lib/libsys_sunos
  	if ${HIJACK}; then
-@@ -1059,6 +1064,7 @@ evaltoolchain ()
+@@ -1059,6 +1063,7 @@ evaltoolchain ()
  		;;
  	*-freebsd*)
  		RUMPKERN_UNDEF='-U__FreeBSD__'
 +		${KERNONLY} || EXTRA_RUMPCLIENT='-lpthread'
  		;;
  	*-sun-solaris*|*-pc-solaris*)
  		RUMPKERN_UNDEF='-U__sun__ -U__sun -Usun'