diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index dca7f97736bc..8380f882fac6 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=	webmin
 PORTVERSION=	2.402
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:sf \
 		${WEBMIN_MODULES:S/gz$/gz:up/}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Web-based interface for system administration for Unix
 WWW=		https://www.webmin.com/
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	p5-Authen-PAM>=0:security/p5-Authen-PAM \
 		p5-IO-Tty>=0:devel/p5-IO-Tty \
 		p5-Net-SSLeay>=0:security/p5-Net-SSLeay
 
 USES=		cpe perl5 python shebangfix
 USE_PYTHON=	py3kplist
 USE_RC_SUBR=	webmin
 SHEBANG_FILES=	${WRKSRC}/webmin/acme_tiny.py
 SUB_FILES=	pkg-message
 SUB_LIST=	PERL=${PERL}
 
 WEBMIN_MODULES=
 
 post-extract:
 	@${RM} ${WRKSRC}/mount/freebsd-mounts-? \
 		${WRKSRC}/webmin-gentoo-init
 	@if [ "${WEBMIN_MODULES}" != "" ]; then \
 		for webmin_module in ${WEBMIN_MODULES}; do \
 			${ECHO} "===> Unpacking updated module: $${webmin_module}"; \
 			${TAR} --unlink -xzf ${DISTDIR}/$${webmin_module} -C ${WRKSRC}; \
 		done; \
 	fi
 	@${RM} -r -f ${WRKSRC}/acl/Authen-SolarisRBAC-0.1
 
 post-patch:
 	@${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/setup.sh
 
 	@${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config -or -name setup.sh \) \) \
 		-exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \
 		-exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \;
 
 	@${FIND} ${WRKSRC} \( -name "*.cgi" -or -name "*.pl" -or -name "*.sh" \) -exec \
 		${REINPLACE_CMD} -e "s@%%PERL%%@${PERL}@g; s@#!/usr/bin/perl@#!${PERL}@; s@#!/usr/local/bin/perl@#!${PERL}@" {} \;
 
 	@${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" -or -name "*.pyc" \) -delete
 
 do-build:
 	@${PYTHON_CMD} -mcompileall ${WRKSRC}/webmin/acme_tiny.py
 	@${PYTHON_CMD} -O -mcompileall ${WRKSRC}/webmin/acme_tiny.py
 	@${CC} ${CFLAGS} -o ${WRKSRC}/mount/freebsd-mounts-7 ${WRKSRC}/mount/freebsd-mounts-7.c
 	@${STRIP_CMD} ${WRKSRC}/mount/freebsd-mounts-7
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/webmin
 	${CP} -r ${WRKSRC}/* ${STAGEDIR}${PREFIX}/lib/webmin
 
 .include <bsd.port.mk>
diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh
index 4126d48f2bd9..b7acc29be455 100644
--- a/sysutils/webmin/files/patch-setup.sh
+++ b/sysutils/webmin/files/patch-setup.sh
@@ -1,61 +1,88 @@
 --- setup.sh.orig
 +++ setup.sh
 @@ -13,6 +13,13 @@
  	bootscript="webmin"
  fi
  
 +nostart="yes"
 +nostop="yes"
 +nochown="yes"
 +nouninstall="yes"
 +noperlpath="yes"
 +atboot=0
 +
  cd `dirname $0`
  if [ -x /bin/pwd ]; then
  	wadir=`/bin/pwd`
-@@ -113,7 +120,7 @@
+@@ -113,15 +120,16 @@
  echo ""
  envetcdir="$config_dir"
  if [ "$envetcdir" = "" ]; then
 -	envetcdir=/etc/webmin
 +	envetcdir=%%PREFIX%%/etc/webmin
  	envetcdirnotfound=1
  fi
  printf "Config file directory [$envetcdir]: "
-@@ -121,7 +128,7 @@
- 	read config_dir
+ if [ "$config_dir" = "" ]; then
+-	read config_dir
++	config_dir="$envetcdir"
++	echo "$envetcdir"
  fi
  if [ "$config_dir" = "" ]; then
 -	config_dir=/etc/webmin
 +	config_dir=%%PREFIX%%/etc/webmin
  fi
  abspath=`echo $config_dir | grep "^/"`
  if [ "$abspath" = "" ]; then
-@@ -232,7 +239,7 @@
+@@ -232,7 +240,7 @@
  else
  	# Config directory exists .. make sure it is not in use
  	ls $config_dir | grep -v rpmsave >/dev/null 2>&1
 -	if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then
 +	if [ "$?" = "0" -a "$config_dir" != "%%PREFIX%%/etc/webmin" ]; then
  		echo "ERROR: Config directory $config_dir is not empty"
  		echo ""
  		exit 2
-@@ -241,7 +248,7 @@
+@@ -241,15 +249,16 @@
  	# Ask for log directory
  	envvardir="$var_dir"
  	if [ "$envvardir" = "" ]; then
 -		envvardir=/var/webmin
 +		envvardir=/var/db/webmin
  		envvardirnotfound=1
  	fi
  	printf "Log file directory [$envvardir]: "
-@@ -249,7 +256,7 @@
- 		read var_dir
+ 	if [ "$var_dir" = "" ]; then
+-		read var_dir
++		var_dir="$envvardir"
++		echo "$envvardir"
  	fi
  	if [ "$var_dir" = "" ]; then
 -		var_dir=/var/webmin
 +		var_dir=/var/db/webmin
  	fi
  	abspath=`echo $var_dir | grep "^/"`
  	if [ "$abspath" = "" ]; then
+@@ -290,7 +299,8 @@
+ 	if [ "$perl" = "" ]; then
+ 		if [ "$perldef" = "" ]; then
+ 			printf "Full path to perl: "
+-			read perl
++			perl="%%PERL%%"
++			echo "$perl"
+ 			if [ "$perl" = "" ]; then
+ 				echo "ERROR: No path entered!"
+ 				echo ""
+@@ -298,10 +308,8 @@
+ 			fi
+ 		else
+ 			printf "Full path to perl (default $perldef): "
+-			read perl
+-			if [ "$perl" = "" ]; then
+-				perl=$perldef
+-			fi
++			perl=$perldef
++			echo "$perldef"
+ 		fi
+ 	fi
+ 	echo ""