diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 04f8ffe57b85..86f10ed8792e 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -6,16 +6,18 @@
 #
 
 PORTNAME=	dbmail
-PORTVERSION=	2.2.17
+PORTVERSION=	2.2.18
 CATEGORIES=	mail
 MASTER_SITES=	http://www.dbmail.org/download/2.2/
 
 MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	An SQL database-based mail system (POP3 and IMAP)
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	gmime-2.0.4:${PORTSDIR}/mail/gmime2
 
-CONFLICTS=	dbmail-*-2.0.* dbmail-2.1.*
+CONFLICTS=	dbmail-*-2.0.* dbmail-2.1.* dbmail-3.*
 
 OPTIONS=	MYSQL		"Build with MySQL support" on \
 		POSTGRESQL	"Build with PostgreSQL support"	off \
@@ -25,11 +27,11 @@ OPTIONS=	MYSQL		"Build with MySQL support" on \
 
 LATEST_LINK=	dbmail22
 USE_AUTOTOOLS=	libtool
-USE_GMAKE=	YES
+USE_GMAKE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
 USE_RC_SUBR=	dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh
 USE_GNOME=	glib20 pkgconfig
-USE_OPENSSL=	YES
+USE_OPENSSL=	yes
 
 CFLAGS+=	-fPIC -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
@@ -61,7 +63,7 @@ PLIST_SUB+=	PORTDOCS=""
 
 .if !defined(WITHOUT_MYSQL)
 CONFIGURE_ARGS+=--with-mysql
-USE_MYSQL=	YES
+USE_MYSQL=	yes
 DATABASE+=	mysql
 PLIST_SUB+=	MYSQL=""
 .else
@@ -108,7 +110,7 @@ IGNORE="requires at least one database backend selected. Run 'make config'"
 
 post-patch:
 	@${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr
-	@${FIND} ${WRKSRC} -name *.orig -type f | ${XARGS} ${RM} -fr
+	@${FIND} ${WRKSRC} -name *.orig -type f -delete
 
 post-configure:
 	@${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \
diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo
index 5ab7e452d652..0a1e7be5df29 100644
--- a/mail/dbmail22/distinfo
+++ b/mail/dbmail22/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbmail-2.2.17.tar.gz) = 11d457b0114047185aff4249afb6b91baf843b393e73ecbb147549960d7eaefd
-SIZE (dbmail-2.2.17.tar.gz) = 896838
+SHA256 (dbmail-2.2.18.tar.gz) = cdf3ac1346515ebcad4b6f19879ccff3879007f2fec1b97cdb4cd72d5892cc07
+SIZE (dbmail-2.2.18.tar.gz) = 833841
diff --git a/mail/dbmail22/pkg-descr b/mail/dbmail22/pkg-descr
index 5c1648e0e4a6..3b9f7d21187f 100644
--- a/mail/dbmail22/pkg-descr
+++ b/mail/dbmail22/pkg-descr
@@ -21,4 +21,4 @@ PostgreSQL or SQLite).
   Changes on a Dbmail system (adding of users, changing passwords etc.) are
   effective immediately.
 
-WWW: http://www.dbmail.org/
+WWW:	http://www.dbmail.org/