diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 643d3b83cda78..a1585f1bb7c3a 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,3 +1,4 @@
 DIST zathura-0.2.9.tar.gz 196690 SHA256 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503 WHIRLPOOL 4c436fc9a78ea797d1e094baa04755c5cd8e3470371ad15296eab0b346c8a4ea5018c10240d5f9f1647995f2e645665aad3c867a67d1281fb3b843375af448ee
 DIST zathura-0.3.3.tar.gz 203604 SHA256 3347decfc8d4b918a6bca1d44657c3b97d4afcea3c8c1f162c57198b13e8dce7 SHA512 0bfcb2c9ca6e7cf44db1c04fdcc5e1e2122b5bd060c10b711a331f885371a523881a46376c770b60cf199530fd9c7814248e8a6da556da8cd464a3a85dbad8e3 WHIRLPOOL c7d94f9db579336f6c2f41b1789e5ffba882b0c00c57e935146297c445cb1ec2894dc7d3dfc0b02ce695e5b5849d3820f91dea8149f206e036c3aae3402b8a4c
 DIST zathura-0.3.5.tar.gz 168808 SHA256 2a71b5d49fa70c01535869f4642bc379bf4c182a97b01e2d09b81800426e330c SHA512 a28b10f58b88f8e162e693d164bd1bbe5a6580b49fcedb0825d0b981f74b91783d650dc13f230be41bee0d11c406f10b2b823e87306e8de5e5e09d70878a8610 WHIRLPOOL 5b912837368ce9958dc38e33b2a3972bb04cd80eba289889359905e908a59ee095c7c57a1fe6fcad8977f4095516557a605e6794ffaf840cd7a5c4c89afc376b
+DIST zathura-0.3.6.tar.gz 169560 SHA256 086a8be25d538fc6539fbee8f01ecf16d25819dfaad50cd2dbd84e30152ccb3b SHA512 6eb8a8ac4589aa03ddfbe652c7700b354c0156a615493c3efdd730c4c5d72e295ad666f406541b664c17eae65c4079697fd4c4d0b9b1f04b8743a7518b123723 WHIRLPOOL 566f2bf5933c0c4dff27b2bac3ef7359135d56e4b0569fbfdf16ea74d57264f9701f200d436bbf50e2cb88c8554cd11484403c76dab435847db1e4a10e4e338c
diff --git a/app-text/zathura/zathura-0.3.6.ebuild b/app-text/zathura/zathura-0.3.6.ebuild
new file mode 100644
index 0000000000000..94e403b1a3ecc
--- /dev/null
+++ b/app-text/zathura/zathura-0.3.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+IUSE="+magic sqlite synctex test"
+
+RDEPEND=">=dev-libs/girara-0.2.5:3=
+	>=dev-libs/glib-2.32:2=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.6:3
+	magic? ( sys-apps/file:= )
+	sqlite? ( dev-db/sqlite:3= )
+	synctex? ( >=app-text/texlive-core-2015 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+pkg_setup() {
+	myzathuraconf=(
+		WITH_MAGIC=$(usex magic 1 0)
+		WITH_SQLITE=$(usex sqlite 1 0)
+		WITH_SYNCTEX=$(usex synctex 1 0)
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR='${PREFIX}'/$(get_libdir)
+		CC="$(tc-getCC)"
+		SFLAGS=''
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_test() {
+	Xemake "${myzathuraconf[@]}" test
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}