diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index f50a3d75ce21..0502e3e3d0b2 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION=	1.070
-PORTREVISION=	5
+PORTVERSION=	1.080
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/updates/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -25,23 +24,9 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 SCRIPTS_ENV+=	WRKDIR="${WRKDIR}"
 
-WEBMIN_MODULES=	acl-1.070-5.wbm.gz \
-		custom-1.070-4.wbm.gz \
-		fetchmail-1.070-1.wbm.gz \
-		init-1.070-1.wbm.gz \
-		lpadmin-1.070-4.wbm.gz \
-		mount-1.070-6.wbm.gz \
-		net-1.070-7.wbm.gz \
-		postfix-1.070-2.wbm.gz \
-		proc-1.070-1.wbm.gz \
-		quota-1.070-1.wbm.gz \
-		sendmail-1.070-4.wbm.gz \
-		shell-1.070-1.wbm.gz \
-		squid-1.070-4.wbm.gz \
-		status-1.070-1.wbm.gz \
-		webmin-1.070-6.wbm.gz
+WEBMIN_MODULES=	net-1.080-7.wbm.gz
 
-WEBMIN_THEMES=	mscstyle3-1.070-1.wbt.gz
+WEBMIN_THEMES=
 
 post-extract:
 	@if [ "${WEBMIN_MODULES}" != "" ]; then \
@@ -66,7 +51,8 @@ post-patch:
 		mysql/config-freebsd postfix/config-freebsd \
 		postgresql/config-freebsd proftpd/config-freebsd \
 		samba/config-freebsd squid/config-freebsd stunnel/config \
-		wuftpd/config-freebsd xinetd/config-freebsd
+		wuftpd/config-freebsd xinetd/config-freebsd \
+		usermin/config
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
 .endfor
 
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 08ce1a458b0c..55d01d214e53 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,17 +1,2 @@
-MD5 (webmin-1.070.tar.gz) = 135851a774691617a74a04243e9f1856
-MD5 (acl-1.070-5.wbm.gz) = 4edd9f7ac2f88bccd2c18426c7ede49c
-MD5 (custom-1.070-4.wbm.gz) = 8ceb1df83a9f8183cb2520aa8b24d717
-MD5 (fetchmail-1.070-1.wbm.gz) = 0e549efa3058d5eff8fc767147b1c653
-MD5 (init-1.070-1.wbm.gz) = 578807238a608d9e05378f58b2bc967f
-MD5 (lpadmin-1.070-4.wbm.gz) = ea071cd407392724db9df6b8e78e9279
-MD5 (mount-1.070-6.wbm.gz) = 6064bd4e6d018168cfc06a1b3ed1e39c
-MD5 (net-1.070-7.wbm.gz) = e9db87f2f2d9e9e2fab46c05ddf78ef3
-MD5 (postfix-1.070-2.wbm.gz) = 475180ade4caf16cb507c32415f7f726
-MD5 (proc-1.070-1.wbm.gz) = d5e218d8c41d01101a60debfbac30eff
-MD5 (quota-1.070-1.wbm.gz) = 2afbd61d50b2a90977d934961bf84e7c
-MD5 (sendmail-1.070-4.wbm.gz) = 715a52729bb47dc98d2ac19633fa0ee3
-MD5 (shell-1.070-1.wbm.gz) = f57565cb6c2aa3982666579f33750923
-MD5 (squid-1.070-4.wbm.gz) = 65fc758bd59611613c72815a9218afcc
-MD5 (status-1.070-1.wbm.gz) = 8cf9fdc564e78f6a61eea187042ebd8e
-MD5 (webmin-1.070-6.wbm.gz) = 1bad3e712bf8d871bd3d308c3820ef5d
-MD5 (mscstyle3-1.070-1.wbt.gz) = bae640b73230d1521696a0e4e2a580eb
+MD5 (webmin-1.080.tar.gz) = 6bb3422a3f9dadc299d0ee0c5f8bb1a6
+MD5 (net-1.080-7.wbm.gz) = 7ec7e70bc02d64f9eb1c770919ea8bdc
diff --git a/sysutils/webmin/files/patch-usermin::config b/sysutils/webmin/files/patch-usermin::config
new file mode 100644
index 000000000000..e703c3f826c3
--- /dev/null
+++ b/sysutils/webmin/files/patch-usermin::config
@@ -0,0 +1,5 @@
+--- usermin/config.orig	Sun Apr  6 14:02:33 2003
++++ usermin/config	Sun Apr  6 14:04:06 2003
+@@ -1 +1 @@
+-usermin_dir=/etc/usermin
++usermin_dir=%%PREFIX%%/etc/usermin