diff --git a/mail/rainloop-community/Makefile b/mail/rainloop-community/Makefile
index 0e0358b6f3e3..b63791cfb2f9 100644
--- a/mail/rainloop-community/Makefile
+++ b/mail/rainloop-community/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	rainloop
 DISTVERSIONPREFIX=	community-
 PKGNAMESUFFIX=	-community${PHP_PKGNAMESUFFIX}
 
 COMMENT=	Modern and interactive webmail - community edition
 
 LICENSE=	AGPLv3
 
+CONFLICTS_INSTALL=	rainloop-[0-9]*
+
 MASTERDIR=	${.CURDIR}/../rainloop
-DISTINFO_FILE=	${.CURDIR}/distinfo
 PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	rainloop-[0-9]*
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/rainloop/Makefile b/mail/rainloop/Makefile
index 6aa0ac18078d..37b9010a9499 100644
--- a/mail/rainloop/Makefile
+++ b/mail/rainloop/Makefile
@@ -1,41 +1,52 @@
 PORTNAME=	rainloop
-PORTVERSION=	1.16.0
+DISTVERSION=	1.16.0
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	https://github.com/RainLoop/rainloop-webmail/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX?=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT?=	Modern and interactive webmail
 
 .if "${PKGNAMESUFFIX}" == "${PHP_PKGNAMESUFFIX}"
 LICENSE=	RainLoop
 LICENSE_NAME=	RainLoop Software License
 LICENSE_TEXT=	License can be found at: http://www.rainloop.net/licensing/
 # Redistribution in any form is prohibited
 LICENSE_PERMS=	auto-accept
 .endif
 
 USES=		php:web,flavors zip
-NO_BUILD=	yes
+USE_PHP=	curl dom iconv json openssl pcre simplexml spl xml zlib
+
 NO_ARCH=	yes
+NO_BUILD=	yes
+
 NO_WRKSUBDIR=	yes
-USE_PHP=	curl dom iconv json openssl pcre simplexml spl xml zlib
-PLIST_SUB=	VER="${PORTVERSION}" WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
+PLIST_SUB=	VER="${PORTVERSION}" \
+		WWWGRP="${WWWGRP}" \
+		WWWOWN="${WWWOWN}"
+
+OPTIONS_DEFAULT=	SQLITE
 OPTIONS_RADIO=		DB
 OPTIONS_RADIO_DB=	MYSQL PGSQL SQLITE
-OPTIONS_DEFAULT=	SQLITE
 
 MYSQL_USE=	PHP=pdo_mysql
 PGSQL_USE=	PHP=pdo_pgsql
 SQLITE_USE=	PHP=pdo_sqlite
 
+post-patch:
+	${REINPLACE_CMD} 's/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND = false/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND = true/' \
+		${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php
+	${RM} ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php.bak
+
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}/data
 	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${WWWDIR}/data
 	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} rainloop ${STAGEDIR}${WWWDIR})
 # Prune empty dirs
 	@${FIND} ${STAGEDIR}${WWWDIR}/${PORTNAME}/v/${PORTVERSION} -type d -empty -delete
 
 .include <bsd.port.mk>