diff --git a/srcpkgs/epiphany/epiphany-devel.template b/srcpkgs/epiphany/epiphany-devel.template
index 87eacab8f5e..1af921b1a24 100644
--- a/srcpkgs/epiphany/epiphany-devel.template
+++ b/srcpkgs/epiphany/epiphany-devel.template
@@ -1,9 +1,6 @@
 # Template file for 'epiphany-devel'.
 #
-depends="nss-devel libgnome-keyring-devel libsoup-gnome-devel
-webkit-gtk3-devel startup-notification-devel NetworkManager-devel
-libseed-devel libnotify-devel avahi-libs-devel avahi-glib-libs-devel
-epiphany>=${version}"
+depends="gtk+3-devel>=3.6.0_2 libxml2-devel webkit-gtk3-devel>=1.10.0"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
@@ -16,4 +13,5 @@ do_install() {
 	vmove usr/lib/pkgconfig usr/lib
 	vmove usr/share/aclocal usr/share
 	vmove usr/share/gir-1.0 usr/share
+	vmove usr/share/gtk-doc usr/share
 }
diff --git a/srcpkgs/epiphany/epiphany.rshlibs b/srcpkgs/epiphany/epiphany.rshlibs
index a37d07fcf2f..4c3bbda1e84 100644
--- a/srcpkgs/epiphany/epiphany.rshlibs
+++ b/srcpkgs/epiphany/epiphany.rshlibs
@@ -1,9 +1,12 @@
 libxml2.so.2
-libgtk-3.so.0
-libgdk-3.so.0
+libwebkitgtk-3.0.so.0
 libsoup-gnome-2.4.so.1
 libsoup-2.4.so.1
 libgnome-keyring.so.0
+libsqlite3.so.0
+libgtk-3.so.0
+libgdk-3.so.0
+libgdk_pixbuf-2.0.so.0
 libgio-2.0.so.0
 libgobject-2.0.so.0
 libglib-2.0.so.0
@@ -11,21 +14,18 @@ libnss3.so
 libplc4.so
 libpthread.so.0
 libc.so.6
+libgmodule-2.0.so.0
+libX11.so.6
+libxslt.so.1
+libm.so.6
+libgnome-desktop-3.so.4
+libnotify.so.4
+libgcr-3.so.1
+libgcr-base-3.so.1
+libpangocairo-1.0.so.0
+libpango-1.0.so.0
+libcairo.so.2
 libavahi-gobject.so.0
 libavahi-common.so.3
 libavahi-client.so.3
-libX11.so.6
-libSM.so.6
-libICE.so.6
-libxslt.so.1
-libm.so.6
-libwebkitgtk-3.0.so.0
-libpangocairo-1.0.so.0
-libcairo.so.2
-libpango-1.0.so.0
-libnotify.so.4
-libgdk_pixbuf-2.0.so.0
-libseed-gtk3.so.0
 libgirepository-1.0.so.1
-libgmodule-2.0.so.0
-libsqlite3.so.0
diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template
index 6149b4a4929..84849122fab 100644
--- a/srcpkgs/epiphany/template
+++ b/srcpkgs/epiphany/template
@@ -1,22 +1,23 @@
 # Template file for 'epiphany'
 pkgname=epiphany
-version=3.4.3
+version=3.6.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-schemas-compile --disable-scrollkeeper
---disable-tests --enable-seed"
-depends="ca-certificates hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.8.2"
+configure_args="--disable-schemas-compile --disable-tests"
+depends="ca-certificates hicolor-icon-theme desktop-file-utils webkit-gtk3>=1.10.0"
 makedepends="which pkg-config intltool gnome-doc-utils gobject-introspection
-nss-devel libgnome-keyring-devel libsoup-gnome-devel gtk+3-devel
-webkit-gtk3-devel>=1.8.2 sqlite-devel libxslt-devel avahi-glib-libs-devel
-startup-notification-devel NetworkManager-devel libseed-devel libnotify-devel"
-fulldepends="iso-codes gsettings-desktop-schemas"
+nss-devel libsoup-gnome-devel>=2.40 gtk+3-devel>=3.6.0_2 libnotify-devel
+webkit-gtk3-devel>=1.10.0 sqlite-devel libxslt-devel avahi-glib-libs-devel
+startup-notification-devel NetworkManager-devel gcr-devel>=3.6.0
+libgnome-keyring-devel>=3.6.0 gnome-desktop-devel>=3.6.0
+gsettings-desktop-schemas-devel>=3.6.0"
+fulldepends="iso-codes gsettings-desktop-schemas>=3.6.0"
 short_desc="Intuitive GNOME web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/epiphany/"
 license="GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=3233fb9e9e8a056c3ef494e85cf5e27068abf51df5fc7f5203ab7afda480f395
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=54458b220e5f320b93f2f59840971627f43f2aa6b1ff5fa3e6a8fad5deef2207
 long_desc="
  Epiphany is a simple yet powerful GNOME web browser targeted at non-technical
  users. Its principles are simplicity and standards compliance. Simplicity is