diff --git a/dev-python/doxypypy/Manifest b/dev-python/doxypypy/Manifest
index 837fb07c39..ff1049ce53 100644
--- a/dev-python/doxypypy/Manifest
+++ b/dev-python/doxypypy/Manifest
@@ -1 +1,2 @@
 DIST doxypypy-0.8.8.6.tar.gz 39019 BLAKE2B 6f1860ec3f9a33762297cb9b0ccdb3523dfb0855f7eb56ef4d5fe0346e25a0980dd3d007af9d4bc6d3a8502589d8a9701c4d428aa342f6156a6c7aa47a5f1ca1 SHA512 17b69d625187983dcd48ec00c317916493228d999f254dd00d85f826ab45e0a5b73557ab5975d7d64a312161c821c78ef1cbca117e2455d3440b247d45ef8399
+DIST doxypypy-0.8.8.6_p20210405.tar.gz 62179 BLAKE2B ee36a130f2c4af9264f04cf00ad311dccda8beeca505d7eb84169b05cf1e0ed6242770ede96b3df9b77385ea238cae84e9cd4e9f8761d23530e2f8e5fbcad797 SHA512 d3fa6bec9381d5531f82837e51988ccea4882fc77109924dd7a7f3ecd99e5afbec09d203629ac3853eeb38cf4592d97a1ec8c18fbe9fb48885794f887aba4336
diff --git a/dev-python/doxypypy/doxypypy-0.8.8.6_p20210405.ebuild b/dev-python/doxypypy/doxypypy-0.8.8.6_p20210405.ebuild
new file mode 100644
index 0000000000..655fee23f6
--- /dev/null
+++ b/dev-python/doxypypy/doxypypy-0.8.8.6_p20210405.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+MY_REV=39115c3d061d2f83e4a030bcb8642ec6f3203e61
+
+DESCRIPTION="A more Pythonic version of doxypy, a Doxygen filter for Python"
+HOMEPAGE="https://github.com/Feneric/doxypypy"
+SRC_URI="https://github.com/Feneric/doxypypy/archive/${MY_REV}.tar.gz -> ${P}.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
+DEPEND="test? ( dev-python/zope-interface[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${PN}-${MY_REV}"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# These files fail to byte-compille (UTF-LE?)
+	# ValueError: source code string cannot contain null bytes
+	# Matches pypy tarball
+	rm doxypypy/test/sample_utf* || die
+	sed -i '/test_utf/,+5d' doxypypy/test/test_doxypypy.py || die
+}