diff --git a/dev-libs/octetos-core/Manifest b/dev-libs/octetos-core/Manifest
index 22d1ed74c2..7cbde57376 100644
--- a/dev-libs/octetos-core/Manifest
+++ b/dev-libs/octetos-core/Manifest
@@ -4,3 +4,4 @@ DIST octetos-core-2.25.0_beta.tar.gz 99477 BLAKE2B 4ea8289c4fdee9bf7c9e0d8626d04
 DIST octetos-core-2.25.1_beta.tar.gz 99500 BLAKE2B b8e9a38e79311866cc30e95bd48669cc59b988ff11a6f860cc22cdd27e5e0b6557880c4747248a4ec5bcbc18ebd49f0b17fdd45d1e0bdbb3720aba7175fa4b4d SHA512 7d5fbbf7aa24dedb28df4e958cf1433f803093372f58920e4e471e33a65ed59cf97b0df7b5918ae65f9c2739bc6b0c83bf99efaac727e67f6a434a3eb5e5bc5f
 DIST octetos-core-2.31.2_beta.tar.gz 109324 BLAKE2B a8cf319229ae03804ebf1062aeee984837a69b20e90257f6a966404525ee650828477f878b87a6ddc32f907ecb4855f3947b39e349095e71945b3236a6e41bfc SHA512 f1051567300025751b8486602897d1e30b25458cdc33f974f23eab72361d65c90d20d4f6d84b2609cdf002a1f87586be053a2104fec275f93a56d6bae87db4ab
 DIST octetos-core-2.31.3_beta.tar.gz 109294 BLAKE2B baf2d98dae6973f9455d747c9833bf8123c9b8171d4d3e6c94e880d9a5adbd0248fa5a02dbbbd63c21d97755b52d239ab126470f0dac982861748a09c315b006 SHA512 fdab21df5080472a393d53a9bd4b1b6a14b04801160051f950f7eb0cb76c602b51244c9d1ab087f659b00da6ddb5b8d3ae52185a82e0e23f2b0beecd2a9484e6
+DIST octetos-core-2.31.5_beta.tar.gz 109294 BLAKE2B 521d6cb0dbb07e933a6df7e64e4b360cb60eefff5cbb639c725de05e11268a234c5256daaedbb74fcb0a7f117df02586d643f25bfe5994e1a7c8f3ea6b947629 SHA512 0fa2275d0b69f4027af90daede76b2d6d27f4b5897ae864caf671d37c4bf69ac5fadedfa18cbe4e02e86f93a35b2d033807634a160bb30bae5627922cec9aaee
diff --git a/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild b/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
new file mode 100644
index 0000000000..8970c37f77
--- /dev/null
+++ b/dev-libs/octetos-core/octetos-core-2.31.5_beta.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYPV="${PV/_beta/-beta/}"
+DESCRIPTION="C/C++ library to mainly provide Semantic Versioned implementation"
+HOMEPAGE="https://github.com/azaeldevel/octetos-core"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/azaeldevel/octetos-core.git"
+else
+	inherit autotools
+	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	dev-libs/libconfig
+	dev-perl/XML-Parser
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/cunit
+	dev-util/intltool
+	sys-devel/bison
+	>=sys-devel/gcc-8.1
+	sys-devel/libtool
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	default
+	eautoreconf -fi
+}