diff --git a/x11-misc/caffeine-ng/Manifest b/x11-misc/caffeine-ng/Manifest
new file mode 100644
index 0000000000..6d3797d54f
--- /dev/null
+++ b/x11-misc/caffeine-ng/Manifest
@@ -0,0 +1 @@
+DIST caffeine-ng-3.5.1.tar.gz 155324 BLAKE2B 3f0ecce6a9fa4a3cdd206a33c80f0ce10ae8472b3f08546dfe5273e9055d8f8840528d9c1d4114b90c2a1967d40b30ce890306862939f4996a675ede90ebef60 SHA512 d37a4ddfefca3ed883a7aade0c25ef9f1bf475d27cb43e7c64ee6f946a9157727c5527ad2c06fb39bac6e74344f523c1d9f2896c301b33cd3c8c6e1ed52a99fb
diff --git a/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
new file mode 100644
index 0000000000..adabd0f6a7
--- /dev/null
+++ b/x11-misc/caffeine-ng/caffeine-ng-3.5.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="Aplication able to temporarily inhibit the screensaver."
+HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+	SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-python/pygobject:3
+	>=dev-python/pyxdg-0.25
+	dev-python/dbus-python
+	>=dev-python/docopt-0.6.2
+	>=dev-python/setproctitle-1.1.10
+	dev-python/setuptools
+	>=dev-python/wheel-0.29.0
+	dev-python/setuptools_scm
+	dev-libs/libappindicator:3
+	x11-libs/gtk+:3
+"
+RDEPEND="${DEPEND}"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild b/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild
new file mode 100644
index 0000000000..857e04ae7c
--- /dev/null
+++ b/x11-misc/caffeine-ng/caffeine-ng-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="Aplication able to temporarily inhibit the screensaver."
+HOMEPAGE="https://github.com/caffeine-ng/caffeine-ng"
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+else
+	SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-python/pygobject:3
+	>=dev-python/pyxdg-0.25
+	dev-python/dbus-python
+	>=dev-python/docopt-0.6.2
+	>=dev-python/setproctitle-1.1.10
+	dev-python/setuptools
+	>=dev-python/wheel-0.29.0
+	dev-python/setuptools_scm
+	dev-libs/libappindicator:3
+	x11-libs/gtk+:3
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/x11-misc/caffeine-ng/metadata.xml b/x11-misc/caffeine-ng/metadata.xml
new file mode 100644
index 0000000000..3df903c795
--- /dev/null
+++ b/x11-misc/caffeine-ng/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>queereen@riseup.net</email>
+		<name>Avis Drożniak</name>
+	</maintainer>
+	<longdescription lang="en">
+		Caffeine is a little daemon that sits in your systray, and prevents the screensaver from showing up, or the system from going to sleep. 
+		It does so when an application is fullscreened (eg: youtube), or when you click on the systray icon (which you can do, when, eg: reading).
+	</longdescription>
+</pkgmetadata>