diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index c0f7a510f8cf..155e2c2bd398 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -2,15 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	busybox
-PORTVERSION=	1.24.1
+PORTVERSION=	1.24.2
 CATEGORIES=	sysutils misc shells
-MASTER_SITES=	http://www.busybox.net/downloads/ LOCAL/mandree
+MASTER_SITES=	https://busybox.net/downloads/
 
-PATCH_SITES=	http://www.busybox.net/downloads/fixes-${PORTVERSION}/
+PATCH_SITES=	https://busybox.net/downloads/fixes-${PORTVERSION}/
+PATCHFILES=	${PORTNAME}-${PORTVERSION}-CVE-2016-2147.patch \
+		${PORTNAME}-${PORTVERSION}-CVE-2016-2148.patch \
+		${PORTNAME}-${PORTVERSION}-ash-recursive-heredocs.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Busybox for FreeBSD
+COMMENT=	Set of common utilities built as single binary
 
 LICENSE=	GPLv2
 
@@ -21,41 +24,40 @@ CONFLICTS_INSTALL=	busybox-unstable-*
 PORTSCOUT=	skipv:1.25.0
 
 CFLAGS+=	-fno-builtin-mempcpy	# avoid -Wshadow warnings
-MAKE_ARGS+=	SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
-# findutils/find.c l. 752+, uses a GCC extension/invalid C code:
-USES=		compiler:nestedfct cpe gmake tar:bzip2
+MAKE_ARGS=	CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" \
+		SKIP_STRIP=y V=1
+USES=		cpe gmake perl5 tar:bzip2
+USE_PERL5=	build
 
-PLIST_FILES=	bin/busybox
+PLIST_FILES=	bin/busybox man/man1/busybox.1.gz
 
 OPTIONS_DEFINE=	DOCS STATIC
 
 STATIC_LDFLAGS=	-static
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-USES+=		perl5
-USE_PERL5=	build
 PORTDOCS=	*
-.endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/scripts/gen_build_files.sh
-	${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/' \
-		${WRKSRC}/libbb/appletlib.c \
-		${WRKSRC}/shell/hush.c
-	${REINPLACE_CMD} -e 's/<alloca.h>/<stdlib.h>/' \
-		${WRKSRC}/scripts/basic/*.c
+	@${REINPLACE_CMD} -e \
+		's|\([[:<:]]\)sed\([[:blank:]]-n\)|\1gsed\2|' \
+		${WRKSRC}/scripts/gen_build_files.sh
+	@${FIND} ${WRKSRC} -name "*.c" -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -e \
+		's|<alloca.h>|<stdlib.h>| ; \
+		 s|<malloc.h>|<stdlib.h>|'
 
 do-configure:
-	${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} oldconfig
+	@${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
+	@(cd ${WRKSRC} && ${DO_MAKE_BUILD} oldconfig)
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	${RM} -f ${STAGEDIR}${DOCSDIR}/.gitignore
-.endif
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} busybox \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}/docs && ${INSTALL_MAN} busybox.1 \
+		${STAGEDIR}${MANPREFIX}/man/man1)
+
+post-install-DOCS-on:
+	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${DOCSDIR} "! -name busybox.1")
 
 .include <bsd.port.mk>
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index 0443925e015c..85eaf99d0ecc 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -1,2 +1,8 @@
-SHA256 (busybox-1.24.1.tar.bz2) = 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d
-SIZE (busybox-1.24.1.tar.bz2) = 2068803
+SHA256 (busybox-1.24.2.tar.bz2) = e71ef53ec656f31c42633918d301405d40dea1d97eca12f272217ae4a971c855
+SIZE (busybox-1.24.2.tar.bz2) = 2066822
+SHA256 (busybox-1.24.2-CVE-2016-2147.patch) = 7cedbcfe2744a7efc1d811372932bc8ef610b8bbdfe34d28ba5a0b5d582b885d
+SIZE (busybox-1.24.2-CVE-2016-2147.patch) = 3453
+SHA256 (busybox-1.24.2-CVE-2016-2148.patch) = 0d42e12334ff14616ce9dc22f02f15c8f3df3ef3334c9ef81abd29d21b5ac687
+SIZE (busybox-1.24.2-CVE-2016-2148.patch) = 1956
+SHA256 (busybox-1.24.2-ash-recursive-heredocs.patch) = 2e4b028036b6e983f04f51a2cfb5e61a6e71e4143e5342c54b96bc2296e5d45c
+SIZE (busybox-1.24.2-ash-recursive-heredocs.patch) = 2442
diff --git a/sysutils/busybox/files/patch-include__libbb.h b/sysutils/busybox/files/patch-include_libbb.h
similarity index 89%
rename from sysutils/busybox/files/patch-include__libbb.h
rename to sysutils/busybox/files/patch-include_libbb.h
index 167378682367..960508031b0c 100644
--- a/sysutils/busybox/files/patch-include__libbb.h
+++ b/sysutils/busybox/files/patch-include_libbb.h
@@ -1,4 +1,4 @@
---- include/libbb.h.orig	2015-10-24 00:24:35 UTC
+--- include/libbb.h.orig	2016-03-17 20:35:49 UTC
 +++ include/libbb.h
 @@ -51,6 +51,9 @@
  #include <termios.h>