diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 07ea30255..29bedf080 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -13,6 +13,7 @@
   * update pychromecast-5.0.0 (not PyChromecast!)
   * bump broadlink-0.13.2
   * bump bravia-tv-1.0.2
+  * add base36-0.1.1
 
 2020-04-16 homeassistant-0.108.6
   * add dep in bravia-tv-1.0.1
diff --git a/dev-python/base36/Manifest b/dev-python/base36/Manifest
new file mode 100644
index 000000000..e93c1dca1
--- /dev/null
+++ b/dev-python/base36/Manifest
@@ -0,0 +1,3 @@
+DIST base36-0.1.1.tar.gz 2782 BLAKE2B 243f33426dfe655e5a5a0ee31741cabaeb3d0e58dde497a447455642de244afe3f27bb714e449188aa014561c1aa0021300009eb0d0d2351379401232f582691 SHA512 bc0c3fdf091d05c76d5d077b07f4f1a61834d327b5e41a7989bbe131f62779f175c1679a3f3618915caf09b6637d5fe1776007039a3ba7a3713ffc661362db08
+EBUILD base36-0.1.1.ebuild 726 BLAKE2B 5c057aa43d3be5c86c611b2b3592e95ebf2136e22c4c08e6f4d4e150e8410a0fdd08e20223480f9723d83bdbf3680afda2b71b4cee0da2c5e4c63f74f8383eb2 SHA512 0e66a2f62c935b0aa3823a5aa7f12119a9acf99fed0ed61df704ca6bd0304160569263db6c98f30a95c9779c7c4db2e564add2740cddcfaa5af78098249054a0
+MISC metadata.xml 450 BLAKE2B 856d21f8317a75c1515dbb3aee9c79daf7d69256008a5e84707ed899bd5d3e0fcbf80a757a51e00b5f7c3edf5c3459c19e29d27a8185fdce9a8b9979f378c394 SHA512 4a4685d2c282e26a207003a6129b6adbe541a06ea238f9f003fa232e6a39ee322184584d9886c156bc0722fe6bdd5a4f0fb679ca38a36327a4c56dbe0f489e8e
diff --git a/dev-python/base36/base36-0.1.1.ebuild b/dev-python/base36/base36-0.1.1.ebuild
new file mode 100644
index 000000000..002da571a
--- /dev/null
+++ b/dev-python/base36/base36-0.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet another implementation for the positional numeral system using 36 as the radix."
+HOMEPAGE="https://github.com/tonyseek/python-base36 https://pypi.org/project/base36/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
diff --git a/dev-python/base36/metadata.xml b/dev-python/base36/metadata.xml
new file mode 100644
index 000000000..8b23d9f68
--- /dev/null
+++ b/dev-python/base36/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">base36</remote-id>
+    <maintainer status="unknown">
+      <email>tonyseek@gmail.com</email>
+      <name>Jiangge Zhang</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>