diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index 1cdcf27d41fb..9d74fe06dfcf 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -1,43 +1,43 @@
 # Created by: Stefan Esser <se@FreeBSD.org>
 
 PORTNAME=	mini_httpd
 PORTVERSION=	1.30
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	https://www.acme.com/software/mini_httpd/
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe ssl
 CPE_VENDOR=	acme
 
 OPTIONS_DEFINE+=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/htpasswd/${PORTNAME}-htpasswd/' \
 		${WRKSRC}/htpasswd.1
 	@${REINPLACE_CMD} -e 's/\(htpasswd(1)\)/${PORTNAME}-\1/' \
 		${WRKSRC}/${PORTNAME}.8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/htpasswd \
 		${STAGEDIR}${PREFIX}/sbin/${PORTNAME}-htpasswd
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh \
 		${STAGEDIR}${PREFIX}/etc/rc.d/mini_httpd
 	${INSTALL_MAN} ${WRKSRC}/htpasswd.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1/${PORTNAME}-htpasswd.1
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 \
 		${STAGEDIR}${MANPREFIX}/man/man8
 	${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf \
 		${STAGEDIR}${PREFIX}/etc/mini_httpd.cnf.sample
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/500.mini_httpd-rotate \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/mini_httpd/files/patch-scripts_mini__httpd.sh b/www/mini_httpd/files/patch-scripts_mini__httpd.sh
new file mode 100644
index 000000000000..6b1a5e0aa3db
--- /dev/null
+++ b/www/mini_httpd/files/patch-scripts_mini__httpd.sh
@@ -0,0 +1,24 @@
+--- scripts/mini_httpd.sh.orig	2016-06-18 20:06:02 UTC
++++ scripts/mini_httpd.sh
+@@ -22,6 +22,7 @@
+ name='mini_httpd'
+ rcvar='mini_httpd_enable'
+ start_precmd='mini_httpd_precmd'
++stop_postcmd='mini_httpd_poststop'
+ mini_httpd_enable_defval='NO'
+ 
+ load_rc_config "$name"
+@@ -35,6 +36,13 @@ mini_httpd_precmd ()
+ 		mount -t devfs devfs "$mini_httpd_devfs"
+ 		devfs -m "$mini_httpd_devfs" rule -s 1 applyset
+ 		devfs -m "$mini_httpd_devfs" rule -s 2 applyset
++	fi
++}
++
++mini_httpd_poststop ()
++{
++	if [ -n "$mini_httpd_devfs" -a "$mini_httpd_devfs" != "/dev" ]; then
++		umount "$mini_httpd_devfs"
+ 	fi
+ }
+