diff --git a/media-libs/bzrtp/Manifest b/media-libs/bzrtp/Manifest
index 6b2b359..3329b35 100644
--- a/media-libs/bzrtp/Manifest
+++ b/media-libs/bzrtp/Manifest
@@ -1,2 +1,4 @@
+AUX cmake-fix.patch 405 BLAKE2B 731149da40ec16356a41d610deeb5257f56c4fd29f44f804ca68b37a7370befb5b0bc21b9c64b24fb76db5c44c1b1ed27fadfade5a95c69b15e6f406311d06f8 SHA512 b1a2c8b4d12ead71a9b4c26fe5738b7e10e5e71bace72aa45715a9a3b4bcab072c61a885f979b1f18804d030c7715f12bfca92a39aa22c06ac017af81c7c0776
 DIST bzrtp-1.0.6.tar.gz 134824 BLAKE2B b6dea2e9a82cd68bc37696a7d86ba4a225b7ff27b075a90113ce6e6aca3a6ed3b787ec9a567bcfa168e05e71d9ad248e3713c3269ce53717c194fcb2f1b7bdb2 SHA512 e1ed1ec43afbc7c5eedfa34d3db926edf16412ad47968d2fab24b6d21dd84353ad0efccd979b99b251e0f98cb4f4b52b5c97b7ca6a577d314da86dcbd6752bb1
 EBUILD bzrtp-1.0.6.ebuild 452 BLAKE2B aa667ae6998f330f0d950a8de3755ec48cda29882f96a3412a8ddfa802e8f4caad41bd72e1542307c344e86ee944e09301058ee5e2ca1eb415395e6ee6d938fa SHA512 77bae3d78da3eb95d003767e96679827fec14a818d9c3acc0e630b71d1953e1948aa1711a2d3bd60cba418bd2e8795e559a673c81b8fc95caa9091bbd08e1ac8
+EBUILD bzrtp-9999.ebuild 812 BLAKE2B f1a53d5146c94eadbdf2754e267b9ca5ec0d67fa1e93ccbfa9d3edfc1b7c802f0b219dd1297d19c3a5b9ccbe3c55d477060a5fdd5b0190bf9fa2076d794be390 SHA512 96c12a05431650899caeb244523038676511eb69e7dc63ad8ade2ba724ce6cf0de49b8e40ff7a1c65239702b8f3eae76b580299dbe64f6464d384c53651f34f5
diff --git a/media-libs/bzrtp/bzrtp-9999.ebuild b/media-libs/bzrtp/bzrtp-9999.ebuild
new file mode 100644
index 0000000..f7f560e
--- /dev/null
+++ b/media-libs/bzrtp/bzrtp-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} = 9999 ]]; then
+    inherit git-r3
+    EGIT_REPO_URI="https://gitlab.linphone.org/BC/public/bzrtp.git"
+	SRC_URI=""
+else
+	SRC_URI="http://www.linphone.org/releases/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Implementation of ZRTP keys exchange protocol"
+HOMEPAGE="http://www.linphone.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">net-libs/bctoolbox-0.6.0
+	dev-libs/libxml2:2
+	dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eapply_user
+	epatch "${FILESDIR}/cmake-fix.patch"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DENABLE_STRICT=NO
+		)
+	cmake-utils_src_configure
+}
+
+
diff --git a/media-libs/bzrtp/files/cmake-fix.patch b/media-libs/bzrtp/files/cmake-fix.patch
new file mode 100644
index 0000000..a2b8c4f
--- /dev/null
+++ b/media-libs/bzrtp/files/cmake-fix.patch
@@ -0,0 +1,11 @@
+--- build/CMakeLists.txt.orig	2019-07-22 09:42:36.746268335 +0100
++++ build/CMakeLists.txt	2019-07-22 09:44:06.927185614 +0100
+@@ -47,7 +47,7 @@
+ 
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
+ 
+-bc_generate_rpm_specfile("rpm/bzrtp.spec.cmake" "${PROJECT_SOURCE_DIR}/bzrtp.spec")
++# bc_generate_rpm_specfile("rpm/bzrtp.spec.cmake" "${PROJECT_SOURCE_DIR}/bzrtp.spec")
+ 
+ include(CPack)
+ 
diff --git a/net-libs/bctoolbox/Manifest b/net-libs/bctoolbox/Manifest
index 1767320..161f630 100644
--- a/net-libs/bctoolbox/Manifest
+++ b/net-libs/bctoolbox/Manifest
@@ -1,2 +1,3 @@
 DIST bctoolbox-0.6.0.tar.gz 111344 BLAKE2B 63960c59d3eb6b759d5c8fd32077f94f8da17a9d9d57d524462900cd216ed45c233a4b33cbd72280ad86760024c7bf42539493ca8fc3644df1e2feb797c2ae32 SHA512 83179260632558de5604322e67fb90fb0c1d2c635ce7e9c378442d4fff2bda5ed7e2ba83b8118f04bc450b6de9869685f0a0fb67b020674e9ec484962d202e21
 EBUILD bctoolbox-0.6.0.ebuild 469 BLAKE2B 07b77de0acb0441aa71c87b660dc903765ddc788da1363c1b934b3f96dcc1dc444d4fa597dd837aa99446da002e760e47f15721406750b471fbdc52f7620ecab SHA512 172f2e31046f1cc1cb594798f8d9a3ebe326cc8b36fb457dcb8c84c399eb101ebf0f56ea860ae0bdf6398b368bb21a9017f4a17c9c0e924381c6db7cbddf14a8
+EBUILD bctoolbox-9999.ebuild 731 BLAKE2B c56b976b17b587ab7b2befb5d056d97bd9eb8823975f932488553697e849010d2c02fa30936b3b60006c18a6092d7f5dd1bc13f91f5c0f92f51f15fcf94d2f8c SHA512 dd5748a69f5711bc30386c784bd03910f056b28421533a8252b45db7b8f43a3966eb0d4c13cb9405b07bbef3e09976d817e1a1711e373bf077205c14453916a8
diff --git a/net-libs/bctoolbox/bctoolbox-9999.ebuild b/net-libs/bctoolbox/bctoolbox-9999.ebuild
new file mode 100644
index 0000000..711b8a0
--- /dev/null
+++ b/net-libs/bctoolbox/bctoolbox-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.linphone.org/BC/public/bctoolbox.git"
+	SRC_URI=""
+else
+	SRC_URI="http://www.linphone.org/releases/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Utilities library used by Belledonne Communications softwares"
+HOMEPAGE="https://savannah.nongnu.org/projects/linphone/"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=dev-util/bcunit-3.0.2
+	net-libs/mbedtls"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_INSTALL_RPATH=ON
+		-DENABLE_STRICT=NO
+		)
+	cmake-utils_src_configure
+}