diff --git a/app-misc/apidb/Manifest b/app-misc/apidb/Manifest
index 45fdf021e0..c1922df46f 100644
--- a/app-misc/apidb/Manifest
+++ b/app-misc/apidb/Manifest
@@ -1,2 +1,3 @@
 DIST 5.11.0-beta.tar.gz 193852 BLAKE2B 522e691afdf97dde0d34982938d1443156057d30b46a2f705881dd76f5ff739dcc2c2b01a4aef8f0edf59d51259bc6a88760a9cee31fbbada622e6da7ad37718 SHA512 42955f30f79c8eb22a18b95aae480ca43ba2de95f0cd5db2a69851b1e3098927a9ef28c8a7ef4ae136d424821c5a6f8ca9f91893161baeca75236683df95d6be
+DIST 5.13.1-beta.tar.gz 190519 BLAKE2B 0fb809e50d28163559e9d633e4b5f58f3111fadf3992071515e61b97709f2925c11e498978739115d20907fe5eb5d9755929d3fa582d9300b69bccefc493d199 SHA512 11d5999faf1475e82b1143c383e13b0b6fc27de78fb81adc73cc2febf5dbb28e45a770c850275642aa338ceddac6ef83fd41f0b739e615855d05a39dc0f901b6
 DIST 5.8.0-beta.tar.gz 183120 BLAKE2B 82d6a2e40aab046b14c6256acca458765bc744144f57d8aeae5201f8e89d97c70d5dbc42fe89880ded8ea9ee9ff96e2f2a91f3da8e7b13fb52cd4ba75caedaf6 SHA512 07d9cb217922239ad79ec6632d28f87d986e69ec3fd5c5440dbae96514a10a66f043efa84031c6541c3b1dc8b6786b5265c9cdd98f8b4102c3e937934bad649a
diff --git a/app-misc/apidb/apidb-5.13.1_beta.ebuild b/app-misc/apidb/apidb-5.13.1_beta.ebuild
new file mode 100644
index 0000000000..0f7dc87bf0
--- /dev/null
+++ b/app-misc/apidb/apidb-5.13.1_beta.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_BINARY=cmake
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake
+
+MYPV="${PV/_beta/-beta}"
+MYPN="${PN}"
+MYP="${MYPN}-${MYPV}"
+
+DESCRIPTION="API Generator for Database access"
+HOMEPAGE="https://github.com/azaeldevel/apidb"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/azaeldevel/apidb.git"
+else
+	inherit autotools
+	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="+mariadb postgresql commands gtk +corelibs"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/boost
+	dev-libs/octetos-coreutils
+	dev-libs/octetos-db-abstract
+	gtk? ( x11-libs/gtk+:3 )
+	dev-libs/libtar
+	mariadb? ( dev-libs/octetos-db-maria )
+	postgresql? ( dev-libs/octetos-db-postgresql )
+	gnome-base/librsvg
+"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+"
+
+S="${WORKDIR}/${PN}-${MYPV}"
+
+src_prepare() {
+	sed -i 's/lib/${LIBDIR}/' src/CMakeLists.txt || die
+	sed -i 's/lib/${LIBDIR}/' src/mysql-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/mariadb-reader-c++/CMakeLists.txt  || die
+	sed -i 's/lib/${LIBDIR}/' src/postgresql-reader-c++/CMakeLists.txt  || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	APIDBBUILD="CORE"
+	APIDBINSTALL=""
+	if use corelibs ;then
+		APIDBINSTALL="CORE"
+	fi
+	if use mariadb ;then
+		APIDBBUILD="$APIDBBUILD;MARIADB"
+		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
+	fi
+	if use postgresql ;then
+		APIDBBUILD="$APIDBBUILD;POSTGRESQL"
+		APIDBINSTALL="$APIDBINSTALL;DRIVERS"
+	fi
+	if use commands ;then
+		APIDBINSTALL="$APIDBINSTALL;COMMANDS"
+	fi
+	if use gtk ;then
+		APIDBINSTALL="$APIDBINSTALL;GTK3"
+	fi
+	local mycmakeargs=(-DAPIDB_VERSION_STAGE=alpha -DPLATFORM=LINUX_GENTOO -DAPIDBBUILD=$APIDBBUILD -DAPIDBINSTALL=$APIDBINSTALL)
+	cmake_src_configure
+}