diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile
index 05227ebe30f5..0784c8ab2935 100644
--- a/devel/eric6/Makefile
+++ b/devel/eric6/Makefile
@@ -1,61 +1,67 @@
 # Created by: Boris Samorodov <bsam@FreeBSD.org>
 
 .include "${.CURDIR}/../../devel/eric6/bsd.eric6.mk"
 
 PKGNAMESUFFIX=	-qt5-${FLAVOR:U:S/_/-/}
 DISTNAME=	${PORTNAME}-nolang-${DISTVERSION}
 PORTREVISION=	0
 CATEGORIES=	devel python
 
 DEPRECATED=	Uses EOL Python 2.7 via www/py-qt5-webengine
 EXPIRATION_DATE=2021-06-23
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}virtualenv>=15.2:devel/py-virtualenv@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 CONFLICTS_INSTALL=	${FLAVORS:N${FLAVOR}:C/^/${PORTNAME}${PKGNAMESUFFIX}-/:C/$/-[0-9]*/}
 
 USES+=		desktop-file-utils python:3.5+ pyqt:5 shebangfix
 USE_PYTHON=	flavors
 USE_PYQT=	chart core gui qscintilla2 webengine \
 		help_run network_run svg_run sql_run
 INSTALL_PY=	install.py -c -f eric6config.freebsd -i ${STAGEDIR}
 SHEBANG_FILES=	*.py eric/eric6/*.py eric/scripts/*.py
 SUB_FILES=	eric6.desktop
 MASTERPORT=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${RM} ${WRKSRC}/eric/i18n/*.qm ${WRKSRC}/eric/i18n/*.ts
 
 do-configure:
 	${SED}  -e 's,PYTHON_SITELIBDIR,${PYTHON_SITELIBDIR},' \
 		-e 's,PREFIX,${PREFIX},' \
 		-e 's,DATADIR,${DATADIR},' \
 		-e 's,LOCALBASE,${LOCALBASE},' \
 		-e 's,DOCSDIR,${DOCSDIR},' \
 		-e 's,EXAMPLESDIR,${EXAMPLESDIR},' \
 		< ${FILESDIR}/config > ${WRKSRC}/eric6config.freebsd
 
 do-install:
 	@(cd ${WRKSRC}; \
 	${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_PY})
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/eric6.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	${LN} -sf ${DATADIR:C|${PREFIX}(/share(/pixmaps)?)?||:C|/[^/]+|../|g}eric6/icons/default/eric.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/eric6.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}/i18n
 	${REINPLACE_CMD} -e 's|${STAGEDIR}|${DATADIR}|g' \
 			 -e 's|${WRKSRC}|${DATADIR}|g' \
 			${STAGEDIR}/${DATADIR}/eric6install.json
 	@${RM}	${STAGEDIR}/${DATADIR}/eric6install.json.bak
 
 .include <bsd.port.mk>
diff --git a/devel/eric6/bsd.eric6.mk b/devel/eric6/bsd.eric6.mk
index 8ad3b30cca12..77ebcfb8f96c 100644
--- a/devel/eric6/bsd.eric6.mk
+++ b/devel/eric6/bsd.eric6.mk
@@ -1,22 +1,22 @@
 # Created by: Boris Samorodov <bsam@FreeBSD.org>
 #
 # This is a set of Makefile macros that are common between devel/eric6 and
 # localized language packages for devel/eric6:
 # german/eric6, russian/eric6, devel/es-eric6
 
 PORTNAME=	eric6
-PORTVERSION=	21.4
+PORTVERSION=	21.5
 PORTREVISION?=	0
 MASTER_SITES=	SF/eric-ide/${PORTNAME}/stable/${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Full featured Python and Ruby editor and IDE based on Qt
 
 LICENSE=	GPLv3
 
 DESCR=		${.CURDIR}/../../devel/eric6/pkg-descr
 MAKE_ENV+=	"HOME=${WRKDIR}"
 
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/devel/eric6/distinfo b/devel/eric6/distinfo
index e7cceb76af0a..b89f92257f93 100644
--- a/devel/eric6/distinfo
+++ b/devel/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617724800
-SHA256 (eric6-nolang-21.4.tar.gz) = 964add58d64cc804819cc4bc27294bc28becd3012e05e4bb8e9cdf7f0fdf12f2
-SIZE (eric6-nolang-21.4.tar.gz) = 13855409
+TIMESTAMP = 1620739784
+SHA256 (eric6-nolang-21.5.tar.gz) = 0a4f9f6b4e91710f52324551951730bf9fa5c184c73305eedbca245a37d9224b
+SIZE (eric6-nolang-21.5.tar.gz) = 12877637
diff --git a/devel/es-eric6/distinfo b/devel/es-eric6/distinfo
index b4ac0db328c4..6081039935d5 100644
--- a/devel/es-eric6/distinfo
+++ b/devel/es-eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617724820
-SHA256 (eric6-i18n-es-21.4.tar.gz) = 095bfacea1cb381e51a10d7aab5514586bb11868b7943ebb688b755032ecbdad
-SIZE (eric6-i18n-es-21.4.tar.gz) = 1071703
+TIMESTAMP = 1620739793
+SHA256 (eric6-i18n-es-21.5.tar.gz) = e7d0ff30f1e3a25ab3f67ebbc44bb12d7b8835d6f8ce2bccda0979df1ee77d81
+SIZE (eric6-i18n-es-21.5.tar.gz) = 1077249
diff --git a/german/eric6/distinfo b/german/eric6/distinfo
index cb0f59c5ec8c..8bbffc5d4020 100644
--- a/german/eric6/distinfo
+++ b/german/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617724834
-SHA256 (eric6-i18n-de-21.4.tar.gz) = 44b0e42e0bfaea8998685095a46864eb895f7cf54874b91f12e227e3b4867110
-SIZE (eric6-i18n-de-21.4.tar.gz) = 1070086
+TIMESTAMP = 1620739808
+SHA256 (eric6-i18n-de-21.5.tar.gz) = 9a705ea8860ca9f070c2cd866491b91415f9943aa3b51cc614dc9d3b9082d6a7
+SIZE (eric6-i18n-de-21.5.tar.gz) = 1075588
diff --git a/russian/eric6/distinfo b/russian/eric6/distinfo
index 26a80d85c5e7..e0f88238cdcd 100644
--- a/russian/eric6/distinfo
+++ b/russian/eric6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617724900
-SHA256 (eric6-i18n-ru-21.4.tar.gz) = b327bbed0e5b28e107dd9142e441f63f8d61d79d6aabea8025dc9d05c89971c9
-SIZE (eric6-i18n-ru-21.4.tar.gz) = 1128764
+TIMESTAMP = 1620739855
+SHA256 (eric6-i18n-ru-21.5.tar.gz) = 92c68f2f1861f6df9eb82a10a763ef7c7a7840228a98aca4dfb2a3a8d2f53671
+SIZE (eric6-i18n-ru-21.5.tar.gz) = 1130640