diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index d7b7beceb534..aa577fe8fde0 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	4.9.6.1
+PORTVERSION=	4.9.8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
-DISTNAME=	vpopmail-4.9.6-1
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/mail/vpopmail-devel/distinfo b/mail/vpopmail-devel/distinfo
index 1a1285736272..ad919022c6aa 100644
--- a/mail/vpopmail-devel/distinfo
+++ b/mail/vpopmail-devel/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-4.9.6-1.tar.gz) = cb37270ef489640a9c62ac2d7babc8e8
+MD5 (vpopmail-4.9.8.tar.gz) = 5ca7636c47899544be32a32ad4af6009
diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist
index a8c5eace203d..e72110fac1d0 100644
--- a/mail/vpopmail-devel/pkg-plist
+++ b/mail/vpopmail-devel/pkg-plist
@@ -7,6 +7,7 @@ vpopmail/bin/vconvert
 vpopmail/bin/vdeldomain
 vpopmail/bin/vdelivermail
 vpopmail/bin/vdeluser
+vpopmail/bin/vipmap
 vpopmail/bin/vmkpasswd
 vpopmail/bin/vmoduser
 vpopmail/bin/vpasswd
@@ -28,6 +29,8 @@ vpopmail/doc/man_html/vdeluser.html
 vpopmail/doc/man_html/vpasswd.html
 vpopmail/doc/man_html/vpopbull.html
 vpopmail/doc/man_html/vsetuserquota.html
+vpopmail/etc/inc_deps
+vpopmail/etc/lib_deps
 vpopmail/include/config.h
 vpopmail/include/vauth.h
 vpopmail/include/vpopmail.h
diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile
index d7b7beceb534..aa577fe8fde0 100644
--- a/mail/vpopmail-stable/Makefile
+++ b/mail/vpopmail-stable/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	4.9.6.1
+PORTVERSION=	4.9.8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
-DISTNAME=	vpopmail-4.9.6-1
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/mail/vpopmail-stable/distinfo b/mail/vpopmail-stable/distinfo
index 1a1285736272..ad919022c6aa 100644
--- a/mail/vpopmail-stable/distinfo
+++ b/mail/vpopmail-stable/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-4.9.6-1.tar.gz) = cb37270ef489640a9c62ac2d7babc8e8
+MD5 (vpopmail-4.9.8.tar.gz) = 5ca7636c47899544be32a32ad4af6009
diff --git a/mail/vpopmail-stable/pkg-plist b/mail/vpopmail-stable/pkg-plist
index a8c5eace203d..e72110fac1d0 100644
--- a/mail/vpopmail-stable/pkg-plist
+++ b/mail/vpopmail-stable/pkg-plist
@@ -7,6 +7,7 @@ vpopmail/bin/vconvert
 vpopmail/bin/vdeldomain
 vpopmail/bin/vdelivermail
 vpopmail/bin/vdeluser
+vpopmail/bin/vipmap
 vpopmail/bin/vmkpasswd
 vpopmail/bin/vmoduser
 vpopmail/bin/vpasswd
@@ -28,6 +29,8 @@ vpopmail/doc/man_html/vdeluser.html
 vpopmail/doc/man_html/vpasswd.html
 vpopmail/doc/man_html/vpopbull.html
 vpopmail/doc/man_html/vsetuserquota.html
+vpopmail/etc/inc_deps
+vpopmail/etc/lib_deps
 vpopmail/include/config.h
 vpopmail/include/vauth.h
 vpopmail/include/vpopmail.h
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index d7b7beceb534..aa577fe8fde0 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	vpopmail
-PORTVERSION=	4.9.6.1
+PORTVERSION=	4.9.8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/vpopmail/
-DISTNAME=	vpopmail-4.9.6-1
 
 MAINTAINER=	nbm@FreeBSD.org
 
diff --git a/mail/vpopmail/distinfo b/mail/vpopmail/distinfo
index 1a1285736272..ad919022c6aa 100644
--- a/mail/vpopmail/distinfo
+++ b/mail/vpopmail/distinfo
@@ -1 +1 @@
-MD5 (vpopmail-4.9.6-1.tar.gz) = cb37270ef489640a9c62ac2d7babc8e8
+MD5 (vpopmail-4.9.8.tar.gz) = 5ca7636c47899544be32a32ad4af6009
diff --git a/mail/vpopmail/pkg-plist b/mail/vpopmail/pkg-plist
index a8c5eace203d..e72110fac1d0 100644
--- a/mail/vpopmail/pkg-plist
+++ b/mail/vpopmail/pkg-plist
@@ -7,6 +7,7 @@ vpopmail/bin/vconvert
 vpopmail/bin/vdeldomain
 vpopmail/bin/vdelivermail
 vpopmail/bin/vdeluser
+vpopmail/bin/vipmap
 vpopmail/bin/vmkpasswd
 vpopmail/bin/vmoduser
 vpopmail/bin/vpasswd
@@ -28,6 +29,8 @@ vpopmail/doc/man_html/vdeluser.html
 vpopmail/doc/man_html/vpasswd.html
 vpopmail/doc/man_html/vpopbull.html
 vpopmail/doc/man_html/vsetuserquota.html
+vpopmail/etc/inc_deps
+vpopmail/etc/lib_deps
 vpopmail/include/config.h
 vpopmail/include/vauth.h
 vpopmail/include/vpopmail.h