diff --git a/sci-electronics/gtkwave/Manifest b/sci-electronics/gtkwave/Manifest
index 3f066ed6fcd49..35b040d142ab9 100644
--- a/sci-electronics/gtkwave/Manifest
+++ b/sci-electronics/gtkwave/Manifest
@@ -1 +1,2 @@
 DIST gtkwave-3.3.106.tar.gz 3507185 BLAKE2B 89389c6eef2fb80b82b048fc94248cf6b30ec0d8fea1260189f2ea1f143123e0294d00f93a0c25f777b6e2c188041af16f4e26e5206e0c65fe23c1f058b19186 SHA512 4deec8dc88210ae542b8066763265450530756d34babf10c7820fe27b23d01e6d2f084ec74b7b0730a645fcb667ba3c0d2dcfb4111e702a523805041dc96768a
+DIST gtkwave-gtk3-3.3.111.tar.gz 3329907 BLAKE2B 523c5b3cb75581d9828d6a1e61df66a0a85ccc41415c9971affaf347948bc7a3b7850cf8abe4f3e57dab56d2f54722a121a8d3b757993d008e1598e4f2ce8843 SHA512 407c1ca87d9645940201c876846e7e6f5e4af67b919a4f63061adc017b2797be5ba10bb9bf132f1b86dff111a64b774e41b8b1630fc99997b5270622eda44c0c
diff --git a/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild b/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild
new file mode 100644
index 0000000000000..ab62d48dc7b74
--- /dev/null
+++ b/sci-electronics/gtkwave/gtkwave-3.3.111.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg
+
+DESCRIPTION="A wave viewer for LXT, LXT2, VZT, GHW and standard Verilog VCD/EVCD files"
+HOMEPAGE="http://gtkwave.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-gtk3-${PV}.tar.gz"
+
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fasttree judy lzma packed tcl gtk3"
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/zlib
+	x11-libs/pango
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	judy? ( dev-libs/judy )
+	tcl? ( dev-lang/tcl:0 dev-lang/tk:0 )
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig"
+
+# Add '-gtk3-' to the pacakge name
+S="${WORKDIR}/${PN}-gtk3-${PV}"
+
+src_prepare() {
+	default
+
+	# do not install doc and examples by default
+	sed -i -e 's/doc examples//' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-mime-update \
+		--enable-largefile \
+		$(use_enable packed struct-pack) \
+		$(use_enable tcl) \
+		$(use_enable lzma xz) \
+		$(use_enable fasttree) \
+		$(use_enable judy) \
+		$(use_enable gtk3)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	use doc && dodoc doc/${PN}.odt
+	if use examples; then
+		rm examples/Makefile* || die
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/sci-electronics/gtkwave/metadata.xml b/sci-electronics/gtkwave/metadata.xml
index 9fdfe88096586..f9951784207b4 100644
--- a/sci-electronics/gtkwave/metadata.xml
+++ b/sci-electronics/gtkwave/metadata.xml
@@ -13,6 +13,7 @@
   <use>
     <flag name="fasttree">Enables experimental Fast SST Tree widget code.</flag>
     <flag name="fatlines">Renders lines as double width in gtkwave.</flag>
+    <flag name="gtk3">Use gtk3 framework instead of gtk2.</flag>
     <flag name="judy">Enables Judy array support.</flag>
     <flag name="packed">Enables '#pragma pack' for data arrays (saves memory, costs time).</flag>
   </use>