diff --git a/net-im/psi-plus/Manifest b/net-im/psi-plus/Manifest
index 7908cac..830206b 100644
--- a/net-im/psi-plus/Manifest
+++ b/net-im/psi-plus/Manifest
@@ -1,2 +1,4 @@
 DIST psi-plus-1.5.1646.tar.gz 9776841 BLAKE2B ec403a4d4c428d43758db1f13d9cdd47bf8d290e62e90ee09275f2d01e600fe39de1fed21e4df0c9b24a12bf2df87b0e0b4687686e16f29ef1a1c25fc841c11e SHA512 8f9cf3fa19e6031cbdce29faf4be8d38885c66743f4ca12def51403db03a0e857fa490df069b49ae7199f90fcf805ad36b6f98c601f6d4a627136b87c69c1250
+DIST psi-plus-1.5.1868.tar.gz 9790134 BLAKE2B 5590f8edfdc4e02be6db1039cf21ab643e045767c3e572aa88b02a8472a81f532244fff231382b18996e2b71f5fc3900cecdead9822cfb526720ec0ff019d142 SHA512 9a0dcda9624a9d320f289f938b8c61b1ca15fb2921527974d090f4cd1e2efa5f87f673eacfe3503412d2a9cc937c8028e4fcc283ef470d11cdc2f8abdaf94b9a
 DIST psi-plus-l10n-1.5.1646.tar.gz 3396594 BLAKE2B c09620a24a6419b22241fbdbc34673015814ed2d83c15a4a75ccb106efb4cc7431a67749c5afb91e8fa3f595489f974dd4af33d5142e08f0a7269e3a2a67def4 SHA512 49ca85255c7dc6fbaeef50eda7a482b04c60c267db2369820f369e3205a05d9e3009f0753ff202a9ec764eec76001656c6626944c57cc6ca649710ce2825c143
+DIST psi-plus-l10n-1.5.1846.tar.gz 3379214 BLAKE2B 04b35e80a74df0f1c5de78036157079e59fc3c3352c5ff9a5e3d4107c53a250665021bc5c071ff605b2f476b50608129f398ec92c85961a80b0f888ff2348771 SHA512 b704675ff9e503134f37ac9499fd20b55d789080bf4a215942dae8c7879b9be3fc29db19001c1f37ac14dadcf43073990b88c10f06b1e9996b9330e27a4cf682
diff --git a/net-im/psi-plus/psi-plus-1.5.1868.ebuild b/net-im/psi-plus/psi-plus-1.5.1868.ebuild
new file mode 100644
index 0000000..00af8e9
--- /dev/null
+++ b/net-im/psi-plus/psi-plus-1.5.1868.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="be bg ca cs de el en eo es et fa fi fr he hu it ja kk mk nl pl pt_BR pt ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit cmake plocale qmake-utils xdg
+
+L10N_VER="1.5.1846"
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="https://psi-im.org"
+SRC_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/${PV}.tar.gz -> psi-plus-${PV}.tar.gz
+	https://github.com/psi-plus/psi-plus-l10n/archive/${L10N_VER}.tar.gz -> psi-plus-l10n-${L10N_VER}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="webengine debug psimedia plugins +hunspell enchant aspell dbus keyring extras X xscreensaver wayland crypt doc"
+
+REQUIRED_USE="
+	?? ( aspell enchant hunspell )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	extras? ( >=dev-build/qconf-2.4 )
+"
+DEPEND="
+	app-crypt/qca:2[ssl]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	net-dns/libidn:0
+	net-libs/http-parser:=
+	net-libs/usrsctp
+	sys-libs/zlib[minizip]
+	x11-libs/libX11
+	x11-libs/libxcb
+	aspell? ( app-text/aspell )
+	dbus? ( dev-qt/qtdbus:5 )
+	enchant? ( app-text/enchant:2 )
+	hunspell? ( app-text/hunspell:= )
+	keyring? ( dev-libs/qtkeychain:= )
+	webengine? (
+		dev-qt/qtwebchannel:5
+		dev-qt/qtwebengine:5[widgets]
+		net-libs/http-parser
+	)
+	plugins? (
+		net-libs/libotr
+		app-text/htmltidy
+		dev-libs/openssl
+		net-libs/libsignal-protocol-c
+		dev-libs/libgcrypt
+		dev-libs/libgpg-error
+		net-libs/libomemo-c
+	)
+	psimedia? (
+		media-libs/gstreamer
+		media-plugins/gst-plugins-meta
+	)
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtimageformats
+	crypt? ( app-crypt/qca[gpg] )
+"
+
+RESTRICT="test"
+
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	BDEPEND+=" l10n_${x}? ( dev-qt/linguist-tools:5 )"
+done
+unset x
+
+src_unpack() {
+	default_src_unpack
+	mv "${WORKDIR}/psi-plus-snapshots-${PV}" "${WORKDIR}/psi-plus-${PV}"
+}
+
+src_prepare() {
+	mv ${S}
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPRODUCTION=$(usex debug OFF ON)
+		-DUSE_ASPELL=$(usex aspell)
+		-DUSE_ENCHANT=$(usex enchant)
+		-DUSE_HUNSPELL=$(usex hunspell)
+		-DUSE_DBUS=$(usex dbus)
+		-DINSTALL_PLUGINS_SDK=1
+		-DUSE_KEYCHAIN=$(usex keyring)
+		-DCHAT_TYPE=$(usex webengine webengine basic)
+		-DUSE_XSS=$(usex xscreensaver)
+		-DUSE_X11=$(usex X)
+		-DLIMIT_X11_USAGE=$(usex wayland)
+		-DPSI_PLUS=ON
+		-DBUILD_PSIMEDIA=$(usex psimedia)
+		-DENABLE_PLUGINS=$(usex plugins)
+		-DUSE_CCACHE=OFF
+		-DINSTALL_EXTRA_FILES=$(usex extras)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use doc && emake -C doc api_public
+}
+
+src_install() {
+	cmake_src_install
+
+	# this way the docs will be installed in the standard gentoo dir
+	rm "${ED}"/usr/share/${PN}/{COPYING,README.html} || die "doc files set seems to have changed"
+	newdoc iconsets/roster/README README.roster
+	newdoc iconsets/system/README README.system
+	newdoc certs/README README.certs
+	dodoc README.html
+
+	use doc && HTML_DOCS=( doc/api/. )
+	einstalldocs
+
+	# install translations
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	cd "${WORKDIR}/psi-plus-l10n-${L10N_VER}" || die
+	insinto /usr/share/${PN}
+	install_locale() {
+		if use "l10n_${1}"; then
+			"${mylrelease}" "translations/psi_${1}.ts" || die "lrelease ${1} failed"
+			doins "translations/psi_${1}.qm"
+		fi
+	}
+	plocale_for_each_locale install_locale
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	einfo "For GPG support make sure app-crypt/qca is compiled with gpg USE flag."
+}