diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index e6ef29d..c0cb057 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,6 +1,8 @@
 AUX i3-4.12-pango.patch 5932 SHA256 fc7c9e1874242a5fe120f9ea45c01b97a50cc0fbe3caf5c7235f24d58c997a36 SHA512 8d808d15f5b1f00ac0f5e9eeacdc2d31062a367ac65594404ea8ba1f27b43bd8ed6cb3cdaa47e6971a88e667d33f467d5d62eb2efead9f9857f1c9a96562d45f WHIRLPOOL 668af23628b0f0808441782a84350a0d1fe4428b8d04a75499a036a967359c878373b7ebc5ad74db5c63d88ec1ad4017a9add5f62f4cda87e4c7718dde7231e4
 AUX i3-4.12-smart-border.patch 718 SHA256 d1516311f1d58e7d30830f8c64d65b1bdb399ec9e425e6208e894e6c12b63a90 SHA512 c3a5fc3356f379459db47e9473254c3e5dbe2a5e9cc4f20ff2f07a906a0ea5d2c647d4656f6b957af1d376d0ea696a4f17a13164261c2cc0c9ef103cc768e892 WHIRLPOOL 452ce597bd0bb086fc9537bd8b454f854131e1ab0e615fc0fb5d6aab01ef32605bd579d7f306159760b297756af8f2661860724ded31d2ef5108df1f5369ebe7
+AUX i3-4.12-tiny-bar.patch 555 SHA256 11b650757481b29c85047377bfa0b6b08566b2257cdd785589dc421078ce92ca SHA512 98853fe76856c54666a28150f8137a83a6b11a76e6443bad17574d9479c2d506696911ec830c5ae3b604422286189c858f7a7fe1312a11678cead228a01a8ba7 WHIRLPOOL b40a56268e91d47632dab1a4bd0abce0ce253a670f10d9704d811130fead6cd3e96c8898d818ae3c208157a3c723b0fd7a0cbefa9d9219d4259e4b7fed9ce618
 AUX i3-4.12-tiny-titles.patch 387 SHA256 af50e52efe4021c2052b6040ade78d7cc2e444858d860e035988bcb27cbe66a9 SHA512 0183749170733eb70e02825fccb1ce45efeff43ce8160b22dbaefd938151cbb35243ab100d5c39eceb4d53ba5e3e7ce25d8c9ec4475b798e83b9b645aa9d219c WHIRLPOOL b671b05f1f8814d118c35f72134aaad152486c5025f883e2afb32937a5eedfe6a73817ead100083061b3c2f8fc00bc7ef3b3a37f4e4e47203a9080cc79c0ecb8
 DIST i3-4.12.tar.bz2 988084 SHA256 e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5 WHIRLPOOL 7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395
 EBUILD i3-4.12-r1.ebuild 1889 SHA256 5ffaa373a06b4bcff1810450f244a7c2962b1599a72ff1a90a7f3dd40ca8a5ce SHA512 610c8bc497dde9d0469cb14f7a068d5d563830a343445f2baa58f774ed93f6b414c9ab4d79590f459ad10257cc3ac6caeabb3e021bd87553c383b79a71fe5eed WHIRLPOOL c5ae0c29394ad4f8178b0141bf01233bee439a97572f4fbf0cfa0b1c6ba812d6eabde24809d2900f06089b8404fa07ac5de789ef09c55c59fb6b63e3581f35c3
+EBUILD i3-4.12-r2.ebuild 1934 SHA256 11e04b71c875b3bb6011b3227bbfc0fd18b3764df1b745ff87b365b109e68bb9 SHA512 bf50722d009b8bef9b0a9277691e19f6a86ed076d465370f7504d3233453ee0ac8d1b27b6287ab8e4ebda87293a3717d09f2a8d8b743b4f90596504dbf45e709 WHIRLPOOL 647a95c372f38d0fdb6f9ece8147c308d35771ef420fc33e891631d1ec80978045ee0a73202db8f3aead81b3d2ab65e0eba3ee8fb771f72d05fc96a507069f8e
 MISC metadata.xml 606 SHA256 7e53dac97b82d6a8815039c5d45bbe3508eb12500255baa39fc7f5a602633511 SHA512 86df03013b8e4e6ad0c0853d51c1858324adb9d8387463321556fc348186df918e18400f7b38504dad21b3e5de7fe206c656dcfe9969978e390d89df1c29f6a5 WHIRLPOOL a27bd1c11d91dc997e1b19c0266d17f8bba65b7783ee00356d39870524a6d081b1151e3ee4ed0bf31c0bb3b0ddc7adcaf3df561f261904979a7adff86d04a2d2
diff --git a/x11-wm/i3/files/i3-4.12-tiny-bar.patch b/x11-wm/i3/files/i3-4.12-tiny-bar.patch
new file mode 100644
index 0000000..2e5b0b6
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.12-tiny-bar.patch
@@ -0,0 +1,17 @@
+diff --git a/i3bar/src/xcb.c b/i3bar/src/xcb.c
+index 496035c..7917c15 100644
+--- a/i3bar/src/xcb.c
++++ b/i3bar/src/xcb.c
+@@ -123,10 +123,10 @@ struct xcb_colors_t {
+ struct xcb_colors_t colors;
+ 
+ /* Horizontal offset between a workspace label and button borders */
+-static const int ws_hoff_px = 4;
++static const int ws_hoff_px = 2;
+ 
+ /* Vertical offset between a workspace label and button borders */
+-static const int ws_voff_px = 3;
++static const int ws_voff_px = 2;
+ 
+ /* Offset between two workspace buttons */
+ static const int ws_spacing_px = 1;
diff --git a/x11-wm/i3/i3-4.12-r2.ebuild b/x11-wm/i3/i3-4.12-r2.ebuild
new file mode 100644
index 0000000..a005c57
--- /dev/null
+++ b/x11-wm/i3/i3-4.12-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/"
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+cairo +pango"
+REQUIRED_USE="pango? ( cairo )"
+
+CDEPEND="dev-libs/libev
+	dev-libs/libpcre
+	>=dev-libs/yajl-2.0.3
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/startup-notification
+	x11-libs/xcb-util
+	x11-libs/xcb-util-cursor
+	x11-libs/xcb-util-keysyms
+	x11-libs/xcb-util-wm
+	cairo? (
+		>=x11-libs/cairo-1.14.4[X,xcb]
+	)
+	pango? (
+		>=x11-libs/pango-1.30.0[X]
+	)"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+	dev-perl/AnyEvent-I3
+	dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+	epatch "${FILESDIR}"/i3-4.12-tiny-titles.patch
+	epatch "${FILESDIR}"/i3-4.12-smart-border.patch
+	epatch "${FILESDIR}"/i3-4.12-tiny-bar.patch
+	epatch "${FILESDIR}"/${P}-pango.patch
+
+	if ! use pango; then
+		sed -e '/^PANGO_.*pangocairo/d' \
+		    -e '/PANGO_SUPPORT/ s/1/0/g' \
+			-i common.mk || die
+	fi
+
+	if ! use cairo; then
+		sed -e '/^PANGO_.*cairo/d' \
+		    -e '/CAIRO_SUPPORT/ s/1/0/g' \
+			-i common.mk || die
+	fi
+
+	cat <<- EOF > "${T}"/i3wm
+		#!/bin/sh
+		exec /usr/bin/i3
+	EOF
+	sed -e 's/FALSE/false/' -i src/handlers.c || die #546444
+	epatch_user #471716
+}
+
+src_compile() {
+	emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+	dohtml -r docs/*
+	doman man/*.1
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+	einfo "There are several packages that you may find useful with ${PN} and"
+	einfo "their usage is suggested by the upstream maintainers, namely:"
+	einfo "  x11-misc/dmenu"
+	einfo "  x11-misc/i3status"
+	einfo "  x11-misc/i3lock"
+	einfo "Please refer to their description for additional info."
+}