diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 8fe25c8..07c9546 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,4 +1,6 @@
 DIST opentoonz-1.5.0.tar.gz 54677708 BLAKE2B 9d12f879e0bcc56219659452af4115b6329a7d9eaf72a9be482fd3153a2ce13a5932741c2917ff4f3108f57cb4bc43d89dec1d3dd80c4d2186c011e5c258f172 SHA512 25566bf2d222290eefd1bdde21cfd970d3a2f775279ceaf2618ef73d470e8a6ff943a347a35b998789ac018262d12e4d0d08133316954e64f4a3593d3dd463b6
+DIST opentoonz-1.6.0.tar.gz 55011226 BLAKE2B e7e27d530ee8356071d38bb3d58de89edcdc6e7e0b28cdb9ba8f7681eda929e13211664a5502499aa3eccfcf090ad81970e9caef365e762b53b7a57f19310afe SHA512 5ee7b724d51f058867d2c7e9c540e68ee3cb6d1350e32c5fd817b10b92ad79cc2a106d36dccc9234503e62788903e6058841dcd8dc39450c889393d0300636e9
 EBUILD opentoonz-1.5.0.ebuild 1816 BLAKE2B a60ced44188b65a2420f5febe7f7616a486f96a0e15abf38e0e56c775f64b9db400ba3ce608bd3b1dc348e7a0f77eb5b2ef7ac9b480854cb88b1cb67a2aaa4f4 SHA512 ed624bbfe5a44069d9c2566cd345270b1fec5e8d95c70c48e73cc3bc90dd61d06dd905f880544b4751cfc642b7e8add42063cbff332a97d184190add04ea10bb
-EBUILD opentoonz-9999.ebuild 1816 BLAKE2B a60ced44188b65a2420f5febe7f7616a486f96a0e15abf38e0e56c775f64b9db400ba3ce608bd3b1dc348e7a0f77eb5b2ef7ac9b480854cb88b1cb67a2aaa4f4 SHA512 ed624bbfe5a44069d9c2566cd345270b1fec5e8d95c70c48e73cc3bc90dd61d06dd905f880544b4751cfc642b7e8add42063cbff332a97d184190add04ea10bb
+EBUILD opentoonz-1.6.0.ebuild 1814 BLAKE2B c8683186aa6dc255fd7056db35b51d4c7850bcd4c31bcb22fd9d7e30eba506c47d72c83ce54b6abc103456ae21356d6702708d9c4b0c501aebc938641c0c232e SHA512 6c70fdb21fc4716b0c5144a7341ab4f21ade5af250ba6fa65e8adb2020662cf3490dab206fff9d2013139b82c161b334ea249c69d1f6e247c43381a40d4c7969
+EBUILD opentoonz-9999.ebuild 1814 BLAKE2B c8683186aa6dc255fd7056db35b51d4c7850bcd4c31bcb22fd9d7e30eba506c47d72c83ce54b6abc103456ae21356d6702708d9c4b0c501aebc938641c0c232e SHA512 6c70fdb21fc4716b0c5144a7341ab4f21ade5af250ba6fa65e8adb2020662cf3490dab206fff9d2013139b82c161b334ea249c69d1f6e247c43381a40d4c7969
 MISC metadata.xml 326 BLAKE2B 5ac38ea95eba8ba264990375974fe08542ad3ad66e4bfe1f8e4fd53467cab642e9dc667f2489c5338a2bbadc2ea2c5e819c8b959f7a3f07359fd5c0b7de4a806 SHA512 8b8d04d1d0d7957bf68b33eb135049792b3bfe9ff0e6c87eed859dc31e510a283efab4120fa52feea90c276a29afc8e5e1e973f14f00a64adc419af554e1f39a
diff --git a/media-gfx/opentoonz/opentoonz-1.6.0.ebuild b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
new file mode 100644
index 0000000..4d5ebd7
--- /dev/null
+++ b/media-gfx/opentoonz/opentoonz-1.6.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/opentoonz/opentoonz.git"
+else
+	SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="An open-source full-featured 2D animation creation software"
+HOMEPAGE="https://opentoonz.github.io/"
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	app-arch/lz4:=
+	>=dev-libs/boost-1.55.0:=
+	dev-libs/lzo:2
+	>=dev-qt/qtcore-5.9:5
+	>=dev-qt/qtgui-5.9:5
+	>=dev-qt/qtmultimedia-5.9:5[widgets]
+	>=dev-qt/qtnetwork-5.9:5
+	>=dev-qt/qtopengl-5.9:5
+	>=dev-qt/qtprintsupport-5.9:5
+	>=dev-qt/qtscript-5.9:5
+	>=dev-qt/qtserialport-5.9:5
+	>=dev-qt/qtsvg-5.9:5
+	>=dev-qt/qtwidgets-5.9:5
+	>=dev-qt/qtxml-5.9:5
+	media-libs/freeglut
+	media-libs/freetype:2
+	media-libs/glew:=
+	media-libs/libjpeg-turbo
+	>=media-libs/libmypaint-1.3.0:=
+	media-libs/libpng:=
+	>=sci-libs/superlu-4.1:=
+	sys-libs/zlib
+	virtual/cblas
+	virtual/libusb:1
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+CMAKE_USE_DIR="${S}/toonz/sources"
+
+src_configure() {
+	local mycmakeargs=(
+		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
+		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
+		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
+		-DCMAKE_SKIP_RPATH=ON
+	)
+
+	# The upstream uses their own modified libtiff
+	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
+	cd "thirdparty/tiff-4.0.3" || die
+	econf \
+		--with-pic \
+		--disable-jbig \
+		--enable-static \
+		--disable-shared
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cd "${S}/thirdparty/tiff-4.0.3" || die
+	emake
+	cmake_src_compile
+}
diff --git a/media-gfx/opentoonz/opentoonz-9999.ebuild b/media-gfx/opentoonz/opentoonz-9999.ebuild
index 97d6e10..4d5ebd7 100644
--- a/media-gfx/opentoonz/opentoonz-9999.ebuild
+++ b/media-gfx/opentoonz/opentoonz-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake xdg
 
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-else
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/opentoonz/opentoonz.git"
+else
+	SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="An open-source full-featured 2D animation creation software"