diff --git a/net-im/jitsi-bin/jitsi-bin-2.10.ebuild b/net-im/jitsi-bin/jitsi-bin-2.10.5550.ebuild
similarity index 61%
rename from net-im/jitsi-bin/jitsi-bin-2.10.ebuild
rename to net-im/jitsi-bin/jitsi-bin-2.10.5550.ebuild
index 7717ef31a..59911e266 100644
--- a/net-im/jitsi-bin/jitsi-bin-2.10.ebuild
+++ b/net-im/jitsi-bin/jitsi-bin-2.10.5550.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit rpm
-
-PV_RAND="5550"
+MY_PV=$(ver_rs 2 -)
 
 DESCRIPTION="Secure IM communicator that supports SIP, XMPP, AIM/ICQ, Windows Live, Yahoo"
 HOMEPAGE="https://jitsi.org/"
 SRC_URI="
-	x86? ( https://download.jitsi.org/jitsi/rpm/jitsi-${PV}-${PV_RAND}.i686.rpm )
-	amd64? ( https://download.jitsi.org/jitsi/rpm/jitsi-${PV}-${PV_RAND}.x86_64.rpm )"
+	x86? ( https://download.jitsi.org/jitsi/rpm/jitsi-${MY_PV}.i686.rpm )
+	amd64? ( https://download.jitsi.org/jitsi/rpm/jitsi-${MY_PV}.x86_64.rpm )"
 
 RESTRICT="strip"
 
@@ -21,8 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=virtual/jre-1.7
-	app-arch/rpm2targz"
+RDEPEND=">=virtual/jre-1.7"
 
 QA_PREBUILT="
 	usr/share/jitsi/lib/native/*
diff --git a/net-im/jitsi-bin/jitsi-bin-2.11.ebuild b/net-im/jitsi-bin/jitsi-bin-2.11.5602.ebuild
similarity index 62%
rename from net-im/jitsi-bin/jitsi-bin-2.11.ebuild
rename to net-im/jitsi-bin/jitsi-bin-2.11.5602.ebuild
index 5bd03847a..ffaf493e1 100644
--- a/net-im/jitsi-bin/jitsi-bin-2.11.ebuild
+++ b/net-im/jitsi-bin/jitsi-bin-2.11.5602.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit rpm
-
-PV_RAND="5602"
+MY_PV=$(ver_rs 2 -)
 
 DESCRIPTION="Secure IM communicator that supports SIP, XMPP, AIM/ICQ, Windows Live, Yahoo"
 HOMEPAGE="https://jitsi.org/"
 #https://download.jitsi.org/jitsi/nightly/rpm/
 SRC_URI="
-	x86? ( https://download.jitsi.org/jitsi/nightly/rpm/jitsi-${PV}-${PV_RAND}.i686.rpm )
-	amd64? ( https://download.jitsi.org/jitsi/nightly/rpm/jitsi-${PV}-${PV_RAND}.x86_64.rpm )"
+	x86? ( https://download.jitsi.org/jitsi/nightly/rpm/jitsi-${MY_PV}.i686.rpm )
+	amd64? ( https://download.jitsi.org/jitsi/nightly/rpm/jitsi-${MY_PV}.x86_64.rpm )"
 
 RESTRICT="strip"
 
@@ -22,8 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND=">=virtual/jre-1.7
-	app-arch/rpm2targz"
+RDEPEND=">=virtual/jre-1.7"
 
 QA_PREBUILT="
 	usr/share/jitsi/lib/native/*