diff --git a/media-gfx/wkhtmltopdf-static/Manifest b/media-gfx/wkhtmltopdf-static/Manifest
index dfe3f6f..293fe33 100644
--- a/media-gfx/wkhtmltopdf-static/Manifest
+++ b/media-gfx/wkhtmltopdf-static/Manifest
@@ -1,4 +1,2 @@
-DIST wkhtmltopdf-0.10.0_rc2-static-amd64.tar.bz2 10995568 RMD160 8e3b271200a241050094761ba77e8add1bd137fc SHA1 e83c6a8b3fbe5961edadd1c71ff034061b80f247 SHA256 6532dea5b4770b6540922a7946c8186682d10a40798eed6491609f1f663f2899
-DIST wkhtmltopdf-0.11.0_rc1-static-amd64.tar.bz2 11175276 RMD160 b60ad8cd28499a99fc80c1df615a2d2caf6b091e SHA1 1f5a9ed45c029055b2770d56ec31c890a3e2d33f SHA256 b20c17284d4c03d81ac6ec3e251201da2b99830c9ac831281c8b5d841e7a6632
-EBUILD wkhtmltopdf-static-0.10.0_rc2.ebuild 614 RMD160 abc3bf3ac8e8b6d50b490a6eb530bb0ffceea6c7 SHA1 3c9b4b01e29fb056595ea78e5b2ce88c2c50317b SHA256 fc461745c84b66b563d7bee8116ffaa3d3b81625522902804fb9c8753ed57bfc
-EBUILD wkhtmltopdf-static-0.11.0_rc1.ebuild 614 RMD160 abc3bf3ac8e8b6d50b490a6eb530bb0ffceea6c7 SHA1 3c9b4b01e29fb056595ea78e5b2ce88c2c50317b SHA256 fc461745c84b66b563d7bee8116ffaa3d3b81625522902804fb9c8753ed57bfc
+DIST wkhtmltox-0.12.3_linux-generic-amd64.tar.xz 14531204 SHA256 40bc014d0754ea44bb90e733f03e7c92862f7445ef581e3599ecc00711dddcaa SHA512 de562fca17469e64c0a589f7de5557c7f1c900c628afa716e5b7dfd2fe39995fcbd46a6302b68db82b4139a73b57d899ed79c0bbb816dcd7b208fc5b5280908d WHIRLPOOL b69c7d3a755b48add14a001452bffd249b809b8a4d8da2b14bfbf0cc5d4e909e04f580e195f65f20a5ed8cd2060e2fe6680342b920ad60b5b33a9618d734c297
+EBUILD wkhtmltopdf-static-0.12.3.ebuild 601 SHA256 ef934a87c4dbfe1fddcf3c755dbc800d80be13841f7cb5da12572dcdb178fa47 SHA512 e787b50935d1932a3607292fd446a8ef820ef0bb60df14a95fd39a06041c35062fb5d896d524c169dd959bb2d3f49449ce9a22f51e1a3809a197175b5ef77eca WHIRLPOOL a1cee3b29184a68557491c3705c7eec1231c99a1d02c5b832ded487295b1cb7adb638cf6054c90537fb4d07f125a46fa87cdd2ff73281e3dbda47d81c170a307
diff --git a/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.11.0_rc1.ebuild b/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.11.0_rc1.ebuild
deleted file mode 100644
index 6a12b5c..0000000
--- a/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.11.0_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Convert html to pdf (and various image formats) using webkit
-static"
-HOMEPAGE="http://code.google.com/p/wkhtmltopdf/"
-SRC_URI="http://wkhtmltopdf.googlecode.com/files/${P/-static/}-static-amd64.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT=strip
-
-RDEPEND="x11-libs/libXrender
-		x11-libs/libXext	
-		media-fonts/urw-fonts"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir ${S}
-}
-
-src_install() {
-	exeinto "/opt/${PN}"
-	doexe "${WORKDIR}/wkhtmltopdf-amd64"
-}
diff --git a/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.10.0_rc2.ebuild b/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.12.3.ebuild
similarity index 58%
rename from media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.10.0_rc2.ebuild
rename to media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.12.3.ebuild
index 6a12b5c..62bdbe1 100644
--- a/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.10.0_rc2.ebuild
+++ b/media-gfx/wkhtmltopdf-static/wkhtmltopdf-static-0.12.3.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-
-DESCRIPTION="Convert html to pdf (and various image formats) using webkit
-static"
-HOMEPAGE="http://code.google.com/p/wkhtmltopdf/"
-SRC_URI="http://wkhtmltopdf.googlecode.com/files/${P/-static/}-static-amd64.tar.bz2"
-
+EAPI=6
+DESCRIPTION="Convert html to pdf (and various image formats) using webkit static"
+HOMEPAGE="http://wkhtmltopdf.org/"
+SRC_URI="http://download.gna.org/wkhtmltopdf/0.12/${PV}/wkhtmltox-${PV}_linux-generic-amd64.tar.xz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
@@ -17,12 +15,9 @@ RDEPEND="x11-libs/libXrender
 		media-fonts/urw-fonts"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	mkdir ${S}
-}
+S="${WORKDIR}/wkhtmltox"
 
 src_install() {
-	exeinto "/opt/${PN}"
-	doexe "${WORKDIR}/wkhtmltopdf-amd64"
+	dodir "/opt/wkhtmltox"
+	cp -r ${S}/* ${D}/opt/wkhtmltox/
 }