diff --git a/app-misc/gplaycli/Manifest b/app-misc/gplaycli/Manifest
index 63e541078..0aac50f01 100644
--- a/app-misc/gplaycli/Manifest
+++ b/app-misc/gplaycli/Manifest
@@ -1,2 +1,3 @@
 DIST gplaycli-3.23.tar.gz 2990154 BLAKE2B 7ad0d3f50a24542ec5a361471b1248a7a19358de4d48f5081360fd967dc68e7d0b02b306b665548638258049187549dbe9813562113683ef309dae753864e3fa SHA512 b64c7faf44418136c2186b310670b63c814720f738ec70a2b031f33753e8fc398692495dcca2e2c5016778386ae02dee132ca71ab2a9d09dfb439965e9871989
 DIST gplaycli-3.24.tar.gz 2990637 BLAKE2B 67f90e2871cf9f57c49c694f8d7f8ca34e0f1f72fb98a0ad084f455da1954c4acaf771076d1ae251c082b73b6ba752759d14363b3eb7f1eaeec7d54efd383d8d SHA512 d7bb2c3c4db58e8d11b82f102031e806bb7ae2fb08b31c0be750735cce0287342f6bd219bf39b8a929418f6d0889857907d4acc81710443a39f2062da8d6cae8
+DIST gplaycli-3.25.tar.gz 2991066 BLAKE2B e03ab224b1f4f783daa7dcce3c0bbe32bac8f87be1991608606550a43b74946ff850b00426201c369a496e1feba7059af3219036f3568d64122e34545d17166f SHA512 118f7866eacf201c26d3d5afff48cf0872e23ee1965731cdee2589cfa8c990aad5e728d9d49cc7087c79282c0af23c5db4f573bc92896640210d56009f5728b5
diff --git a/app-misc/gplaycli/files/pyaxmlparser.patch b/app-misc/gplaycli/files/pyaxmlparser.patch
deleted file mode 100644
index 21161a845..000000000
--- a/app-misc/gplaycli/files/pyaxmlparser.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-reverted:
---- b/gplaycli/gplaycli.py
-+++ a/gplaycli/gplaycli.py
-@@ -32,7 +32,7 @@
- from gpapi.googleplay import RequestError
- from google.protobuf.message import DecodeError
- from pkg_resources import get_distribution, DistributionNotFound
-+from pyaxmlparser import APK
--from androguard.core.bytecodes.apk import APK
- 
- from clint.textui import progress
- 
-@@ -494,7 +494,7 @@
- 			apk = APK(filepath)
- 			packagename = apk.package
- 			package_bunch.append(packagename)
-+			version_codes.append(util.vcode(apk.version_code))
--			version_codes.append(util.vcode(apk.get_androidversion_code()))
- 
- 		# BulkDetails requires only one HTTP request
- 		# Get APK info from store
-reverted:
---- b/requirements.txt
-+++ a/requirements.txt
-@@ -1,4 +1,4 @@
- protobuf
- gpapi
-+pyaxmlparser
--androguard
- clint
-reverted:
---- b/setup.py
-+++ a/setup.py
-@@ -33,7 +33,7 @@
- 		install_requires=[
- 				'protobuf',
- 				'gpapi == 0.4.2',
-+				'pyaxmlparser',
--				'androguard',
- 				'clint',
- 		],
- )
diff --git a/app-misc/gplaycli/gplaycli-3.25.ebuild b/app-misc/gplaycli/gplaycli-3.25.ebuild
new file mode 100644
index 000000000..d7bc1be21
--- /dev/null
+++ b/app-misc/gplaycli/gplaycli-3.25.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Google Play Downloader via Command line"
+HOMEPAGE="https://github.com/matlink/gplaycli"
+SRC_URI="https://github.com/matlink/gplaycli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/protobuf-python[${PYTHON_USEDEP}]
+	>=dev-python/gpapi-0.4.3[${PYTHON_USEDEP}]
+	dev-python/pyaxmlparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+#python_prepare_all() {
+#	sed -i -e "s|os.path.expanduser('~')+'/.config/|'/etc/|" setup.py || die
+#	distutils-r1_python_prepare_all
+#}
diff --git a/dev-python/pyaxmlparser/Manifest b/dev-python/pyaxmlparser/Manifest
index 6fdab1414..41b16c4ea 100644
--- a/dev-python/pyaxmlparser/Manifest
+++ b/dev-python/pyaxmlparser/Manifest
@@ -1 +1,2 @@
-DIST pyaxmlparser-0.3.7.tar.gz 28475 SHA256 b95f9f06cdf5c26b83835011da234c08758c06fe428ade301bcc19a691c8fcea SHA512 67e8bac54a25f05ba4a3b5c59e247772c98dd5fdabf414670a8829a7d5f054d080e6fbe79cadce5343210cb11a5753195b28b1db8460070180c8c98477d2520d WHIRLPOOL a018ab995d3f485f34dd9fbaf337f4048d1970a0b32b51af8dc19726f198f4cd283198d8398983ffa5614ef0f6841626959bb97cd493c3b7c883aeafc9df6bef
+DIST pyaxmlparser-0.3.11.tar.gz 38317 BLAKE2B af014009daa8b2d0639fcf835d95adc5b294548d4f8850f7adccc2db582f6f4c09c6ea93adc2a435ece221ae35347e5990b33bb4a84b9274906c7a73522056ad SHA512 e6df71e0be4e09f6c64038c4a0cc8c20f0d1dfd13a9d34a9607deb8ff10e4f088cc75c0729804f10a0dae32f40d9c21d869d2475f262fdf26abf73bceabc40cc
+DIST pyaxmlparser-0.3.7.tar.gz 28475 BLAKE2B 4b4e3099c6801c936a86a80c4efaea674dcd0c855279598d7108492db63dd71e11584c01e53d05d307dbaad94dd6280d92329022c19a9e19c59ded9dfeae769f SHA512 67e8bac54a25f05ba4a3b5c59e247772c98dd5fdabf414670a8829a7d5f054d080e6fbe79cadce5343210cb11a5753195b28b1db8460070180c8c98477d2520d
diff --git a/dev-python/pyaxmlparser/pyaxmlparser-0.3.11.ebuild b/dev-python/pyaxmlparser/pyaxmlparser-0.3.11.ebuild
new file mode 100644
index 000000000..5bbb9dd93
--- /dev/null
+++ b/dev-python/pyaxmlparser/pyaxmlparser-0.3.11.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit distutils-r1
+
+DESCRIPTION="Parser for Android XML file and get Application Name without using Androguard"
+HOMEPAGE="https://github.com/appknox/pyaxmlparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=dev-python/lxml-3.7.3
+	>=dev-python/click-6.7
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/profiles/pentoo/base/package.accept_keywords/app-misc b/profiles/pentoo/base/package.accept_keywords/app-misc
index bac94220a..a008cc5b4 100644
--- a/profiles/pentoo/base/package.accept_keywords/app-misc
+++ b/profiles/pentoo/base/package.accept_keywords/app-misc
@@ -12,6 +12,6 @@ app-misc/hivex
 app-misc/freediag
 app-misc/openodb
 
-=app-misc/gplaycli-3*
+=app-misc/gplaycli-3.23*
 
 =app-misc/mc-4.8.20-r2
diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python
index f2306aa5f..5174ed85c 100644
--- a/profiles/pentoo/base/package.accept_keywords/dev-python
+++ b/profiles/pentoo/base/package.accept_keywords/dev-python
@@ -210,9 +210,11 @@ dev-python/pyDes
 #required by gplaycli
 ~dev-python/clint-0.5.1
 ~dev-python/args-0.1.0
-~dev-python/pyaxmlparser-0.3.7
+~dev-python/pyaxmlparser-0.3.11
+=dev-python/click-6.7*
 
-~dev-python/gpapi-0.4.3
+#~dev-python/gpapi-0.4.3
+~dev-python/gpapi-0.4.2
 
 #Tiredful-API
 ~dev-python/django-filter-0.15.3