--- x11vnc-0.9.13_p20150111.ebuild
+++ x11vnc-0.9.13_p20150627.ebuild
@@ -4,18 +4,18 @@
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools eutils vcs-snapshot
 
 DESCRIPTION="A VNC server for real X displays"
-HOMEPAGE="http://www.karlrunge.com/x11vnc/"
-SRC_URI="https://github.com/LibVNC/x11vnc/archive/82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a.zip"
+HOMEPAGE="https://libvnc.github.io/"
+SRC_URI="https://github.com/LibVNC/x11vnc/archive/7aba1a36d902ec601e4aae1bc32e957749eb25d3.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="avahi crypt fbcon ssl xinerama"
 
-RDEPEND="
+RDEPEND=">=net-libs/libvncserver-0.9.8
 	x11-libs/libX11
 	x11-libs/libXdamage
 	x11-libs/libXext
@@ -24,7 +24,6 @@
 	>=x11-libs/libXtst-1.1.0
 	avahi? ( >=net-dns/avahi-0.6.4 )
 	ssl? ( dev-libs/openssl:= )
-	>=net-libs/libvncserver-0.9.8
 	xinerama? ( x11-libs/libXinerama )"
 DEPEND="${RDEPEND}
 	x11-libs/libXt
@@ -35,8 +34,6 @@
 	x11-proto/xextproto
 	xinerama? ( x11-proto/xineramaproto )"
 
-S="${WORKDIR}/x11vnc-82eb9752485db87c9c6d3d6bb4aa1ae7ac81174a"
-
 DOCS=(ChangeLog README)
 
 src_prepare() {