diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 35b29aedfbf4..f1ad2a86c0fa 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,106 +1,106 @@
 PORTNAME=	claws-mail
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail news
 
 COMMENT=	Lightweight and featureful GTK based e-mail and news client
 WWW=		https://www.claws-mail.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libetpan.so:mail/libetpan \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libgcrypt.so:security/libgcrypt \
 		libgnutls.so:security/gnutls \
 		libharfbuzz.so:print/harfbuzz \
 		libnettle.so:security/nettle \
 		libsasl2.so:security/cyrus-sasl2
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \
 		mime-support>0:misc/mime-support
 
 USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gettext \
 		gettext-tools gnome pathfix pkgconfig python shebangfix \
 		ssl xorg
 USE_GNOME=	cairo librsvg2
 USE_XORG=	ice sm
 SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
 
 OPTIONS_DEFINE=		COMPFACE DEBUG DOCS ENCHANT IPV6 LDAP NLS STARTUP \
 			THEMES
 OPTIONS_DEFAULT=	COMPFACE ENCHANT GTK2 STARTUP THEMES
 OPTIONS_RADIO=		BRANCH
 OPTIONS_RADIO_BRANCH=	GTK2 GTK3
 OPTIONS_SUB=		yes
 
 COMPFACE_DESC=	X-Face support
 ENCHANT_DESC=	Spell checking support
 GTK2_DESC=	Build GTK2+ release
 GTK3_DESC=	Build GTK3+ release
 STARTUP_DESC=	Startup notification support
 THEMES_DESC=	Additional themes
 
 COMPFACE_LIB_DEPENDS=		libcompface.so:mail/faces
 COMPFACE_CONFIGURE_ENABLE=	compface
 
 DEBUG_CONFIGURE_ON=	--enable-maintainer-mode
 
 ENCHANT_LIB_DEPENDS=		libenchant.so:textproc/enchant
 ENCHANT_CONFIGURE_ENABLE=	enchant
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LDAP_USES=		ldap
 LDAP_CONFIGURE_ENABLE=	ldap
 
 NLS_USES=		gettext-tools
 NLS_CONFIGURE_OFF=	--disable-nls
 
 STARTUP_LIB_DEPENDS=		libstartup-notification-1.so:x11/startup-notification
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 
 THEMES_RUN_DEPENDS=	claws-mail-themes>0:x11-themes/claws-mail-themes
 
 .include <bsd.port.options.mk>
 MASTER_OPTIONS=	${PORT_OPTIONS}
 .include "Makefile.claws"
 
 .if ${PORT_OPTIONS:MGTK2}
 USE_GNOME+=	gtk20
 
 PLIST_SUB+=	GTK2=""
 .else
 PLIST_SUB+=	GTK2="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
 USE_GNOME+=	gtk30
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 	${WRKSRC}/src/common/ssl.c
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/tools && \
 		${INSTALL_SCRIPT} acroread2claws-mail.pl \
 		calypso_convert.pl claws-mail-compose-insert-files.pl \
 		cm-reparent.pl convert_mbox.pl csv2addressbook.pl ddg_search.pl \
 		eud2gc.py filter_conv.pl filter_conv_new.pl fix_date.sh \
 		gif2xface.pl google_msgid.pl kmail-mailbox2claws-mail.pl \
 		kmail2claws-mail.pl kmail2claws-mail_v2.pl mairix.sh \
 		mew2claws-mail.pl multiwebsearch.conf multiwebsearch.pl \
 		nautilus2claws-mail.sh outlook2claws-mail.pl popfile-link.sh \
 		tb2claws-mail tbird2claws.py textviewer.pl textviewer.sh \
 		thunderbird-filters-convertor.pl update-po uudec uuooffice \
 		vcard2xml.py \
 		${STAGEDIR}${DATADIR})
 
 post-install-DOCS-on:
 	(cd ${WRKSRC} && ${INSTALL_DATA} NEWS README TODO ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/tools/README ${STAGEDIR}${DOCSDIR}/README.tools
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index dc05c10dedf5..7acbd951335e 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,53 +1,53 @@
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
 MAINTAINER=	portmaster@bsdforge.com
 
 LICENSE=	GPLv3
 
 USES+=		autoreconf gettext-tools gmake iconv libtool pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} --disable-dbus --disable-static
 
 .include "${.CURDIR}/../claws-mail/Makefile.ver"
 .include "${.CURDIR}/../claws-mail/Makefile.claws.plugins"
 
 .for p in ${CLAWS_PLUGINS}
 CONFIGURE_ARGS+=	--disable-${p}-plugin
 .endfor
 
 .if defined(CLAWS_PLUGINS_BUILD)
 DISTNAME=	claws-mail-${PORTVERSION}
 PKGNAMEPREFIX=	claws-mail-
 
 BUILD_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 RUN_DEPENDS+=	claws-mail>=${PORTVERSION}:mail/claws-mail
 
 MASTERDIR=	${.CURDIR}/../claws-mail
 DESCR=		${.CURDIR}/pkg-descr
 FILESDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
 CONFIGURE_ARGS+=	--disable-nls
 
 .  for p in ${CLAWS_PLUGINS_BUILD}
 CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S|--disable-${p}-plugin||}
 PLIST_FILES+=	lib/claws-mail/plugins/${p:S|spam_|spam|}.so
 .  endfor
 
 do-build:
 .  for p in ${CLAWS_PLUGINS_BUILD}
 	(cd ${WRKSRC}/src/plugins/${p} && ${MAKE_CMD})
 .  endfor
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/claws-mail/plugins
 .  for p in ${CLAWS_PLUGINS_BUILD}
 	(cd ${WRKSRC}/src/plugins/${p} && \
 		${INSTALL_LIB} .libs/${p:S|spam_|spam|}.so \
 		${STAGEDIR}${PREFIX}/lib/claws-mail/plugins)
 .  endfor
 
 .endif