diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index 4f0ab41360e6..f8ae30449328 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bmf
 PORTVERSION=	0.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	SF
@@ -12,27 +12,23 @@ WWW=		https://sourceforge.net/projects/bmf/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-HAS_CONFIGURE=	yes
-BINARY_ALIAS=	gcc=${CC} g++=${CXX}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+USES=		mysql
 
-OPTIONS_DEFINE=	BDB DEBUG DOCS MANPAGES MYSQL
-OPTIONS_DEFAULT=BDB MANPAGES
+HAS_CONFIGURE=	yes
+
+BINARY_ALIAS=	gcc=${CC} g++=${CXX}
+
+CFLAGS+=	-I${LOCALBASE}/include/mysql
+LDFLAGS+=	-L${LOCALBASE}/lib/mysql
+
+CONFIGURE_ARGS=	--with-mysql --without-libdb
+
+OPTIONS_DEFINE=	DEBUG DOCS MANPAGES
+OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 
-BDB_USES=		bdb
-BDB_CONFIGURE_WITH=	libdb
-BDB_CFLAGS=		-I${BDB_INCLUDE_DIR}
-BDB_LDFLAGS=		-L${BDB_LIB_DIR}
-BDB_CONFIGURE_ENV=	DB_LIBNAME=-l${BDB_LIB_NAME}
-
 DEBUG_CONFIGURE_ON=	--debug=yes
 
-MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_CFLAGS=		-I${LOCALBASE}/include/mysql
-MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
-MYSQL_USES=		mysql
-
 do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} bmf bmfconv ${STAGEDIR}${PREFIX}/bin