diff --git a/dev-util/android-sdk-build-tools/Manifest b/dev-util/android-sdk-build-tools/Manifest
new file mode 100644
index 000000000..51edcfc0d
--- /dev/null
+++ b/dev-util/android-sdk-build-tools/Manifest
@@ -0,0 +1,2 @@
+DIST build-tools_r30-linux.zip 68819159 BLAKE2B e1c939df216b6e976cdaed51a635d40fc502a44713f3a26b74b9e1363b04269cbc39fd4f9be0d8ff99d0b046f94e83b156fdf3453d0a9274ef9f2a3e520a4e7c SHA512 242b115b32d65847093e71ae78244e5c51673d49821afd933782558c6fb706c0b1b114981edef89a8213fe2d8ca53bfbc51015bdde4ee3ced43b7fe0748ed655
+DIST build-tools_r30.0.2-linux.zip 52664453 BLAKE2B 628665aa6b63a5c1d93a8a996d6495884f38a09fa9f8adbbfa853665a5a68c12d317a75ed91b3998342e2f010424f35450f998b6f3e21e3b1e08e09f405052ea SHA512 38661dbdc2611c18cca49c27a708c592129c87dbc603ea2df3aff3918ba41f022762a1476f4de0142943933fa3298492d7afae7623c7e6ed778d03a23697c9e0
diff --git a/dev-util/build-tools/build-tools-30.ebuild b/dev-util/android-sdk-build-tools/android-sdk-build-tools-30.0.2.ebuild
similarity index 97%
rename from dev-util/build-tools/build-tools-30.ebuild
rename to dev-util/android-sdk-build-tools/android-sdk-build-tools-30.0.2.ebuild
index a3d68a3f4..353ad61b2 100644
--- a/dev-util/build-tools/build-tools-30.ebuild
+++ b/dev-util/android-sdk-build-tools/android-sdk-build-tools-30.0.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.google.com/android/repository/build-tools_r${PV}-linux.zip"
 
 LICENSE="android"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ncurses"
 
 RDEPEND="ncurses? ( sys-libs/ncurses-compat )
diff --git a/dev-util/android-sdk-build-tools/android-sdk-build-tools-30.ebuild b/dev-util/android-sdk-build-tools/android-sdk-build-tools-30.ebuild
new file mode 100644
index 000000000..353ad61b2
--- /dev/null
+++ b/dev-util/android-sdk-build-tools/android-sdk-build-tools-30.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Android SDK Build Tools"
+HOMEPAGE="https://developer.android.com/studio/releases/build-tools"
+#https://androidsdkoffline.blogspot.com/p/android-sdk-build-tools.html
+SRC_URI="https://dl.google.com/android/repository/build-tools_r${PV}-linux.zip"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="ncurses"
+
+RDEPEND="ncurses? ( sys-libs/ncurses-compat )
+		sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+RESTRICT="strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/android-11"
+
+ANDROID_SDK_BUILD_TOOLS_DIR="/opt/android-sdk-update-manager/${PN}/${PV}"
+
+src_install() {
+	dodir "${ANDROID_SDK_BUILD_TOOLS_DIR}/"
+	cp -R "${S}"/* "${ED}/${ANDROID_SDK_BUILD_TOOLS_DIR}/"  || die "Copy files failed"
+
+	for linkfile in aapt aapt2 apksigner dexdump zipalign
+	do
+		dosym "${EPREFIX}${ANDROID_SDK_BUILD_TOOLS_DIR}/$linkfile" /usr/bin/$linkfile
+	done
+}
diff --git a/dev-util/build-tools/Manifest b/dev-util/build-tools/Manifest
deleted file mode 100644
index 5f41c2d9e..000000000
--- a/dev-util/build-tools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST build-tools_r30-linux.zip 68819159 BLAKE2B e1c939df216b6e976cdaed51a635d40fc502a44713f3a26b74b9e1363b04269cbc39fd4f9be0d8ff99d0b046f94e83b156fdf3453d0a9274ef9f2a3e520a4e7c SHA512 242b115b32d65847093e71ae78244e5c51673d49821afd933782558c6fb706c0b1b114981edef89a8213fe2d8ca53bfbc51015bdde4ee3ced43b7fe0748ed655
diff --git a/dev-util/objection/objection-1.9.5.ebuild b/dev-util/objection/objection-1.9.5.ebuild
index 77e18f6db..d063580e2 100644
--- a/dev-util/objection/objection-1.9.5.ebuild
+++ b/dev-util/objection/objection-1.9.5.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=dev-util/frida-tools-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/litecli-1.3.0[${PYTHON_USEDEP}]
 	net-libs/nodejs[npm]
 	patchapk? (
-		dev-util/build-tools
+		dev-util/android-sdk-build-tools
 		dev-util/android-tools
 		virtual/jdk:*
 		dev-util/apktool
diff --git a/dev-util/objection/objection-1.9.6.ebuild b/dev-util/objection/objection-1.9.6.ebuild
index 77e18f6db..d063580e2 100644
--- a/dev-util/objection/objection-1.9.6.ebuild
+++ b/dev-util/objection/objection-1.9.6.ebuild
@@ -29,7 +29,7 @@ RDEPEND=">=dev-util/frida-tools-7.0.0[${PYTHON_USEDEP}]
 	>=dev-python/litecli-1.3.0[${PYTHON_USEDEP}]
 	net-libs/nodejs[npm]
 	patchapk? (
-		dev-util/build-tools
+		dev-util/android-sdk-build-tools
 		dev-util/android-tools
 		virtual/jdk:*
 		dev-util/apktool
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-util b/profiles/pentoo/base/package.accept_keywords/dev-util
index dd0457897..147c1da22 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-util
+++ b/profiles/pentoo/base/package.accept_keywords/dev-util
@@ -4,7 +4,6 @@ dev-util/androguard
 dev-util/apktool
 dev-util/appmon
 ~dev-util/bokken-1.8
-dev-util/build-tools
 =dev-util/cutter-1*
 dev-util/dependency-check-bin
 =dev-util/dex2jar-2.1*
diff --git a/profiles/updates/4Q-2020 b/profiles/updates/4Q-2020
index 73f857d3d..4b68a7d80 100644
--- a/profiles/updates/4Q-2020
+++ b/profiles/updates/4Q-2020
@@ -1,2 +1,3 @@
 move dev-util/jd-cmd dev-util/jd-cli
 move dev-util/jd-cmd-bin dev-util/jd-cli-bin
+move dev-util/build-tools dev-util/android-sdk-build-tools