diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index c3f4c5b9214..f18cbd7c838 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,27 +1,33 @@
 # Template file for 'totem'
 pkgname=totem
-version=3.4.3
+version=3.6.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper --disable-static
 --disable-schemas-compile --disable-python --enable-nautilus"
+
 makedepends="which pkg-config intltool gnome-doc-utils gnutls-devel
-gst-plugins-base-devel totem-pl-parser-devel nautilus-devel libbluetooth-devel
-evolution-data-server-devel libsoup-devel mx-devel clutter-gst-devel
-clutter-gtk-devel libpeas-devel libXtst-devel grilo-devel libepc-devel"
-fulldepends="grilo-plugins hicolor-icon-theme desktop-file-utils
-gst-ffmpeg gst-plugins-bad gst-plugins-ugly gst-plugins-good"
+gst-plugins-base1-devel totem-pl-parser-devel nautilus-devel>=3.6.0
+libbluetooth-devel evolution-data-server-devel>=3.6.0 dbus-glib-devel
+libsoup-devel mx-devel clutter-gst-devel>=1.9.92 clutter-gtk-devel>=1.3.2
+libpeas-devel libXtst-devel grilo-devel>=0.2.0 libepc-devel vala-devel
+gst-plugins-bad1-devel>=1.0.0_2 gsettings-desktop-schemas-devel>=3.6.0
+libzeitgeist-devel"
+
+fulldepends="grilo-plugins>=0.2.0 hicolor-icon-theme desktop-file-utils
+gst-plugins-ugly1 gst-plugins-good1 gsettings-desktop-schemas>=3.6.0"
+
 # XXX xulrunner plugin.
 subpackages="totem-devel totem-mozilla-plugin"
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 # XXX reenable python plugin if pylint pkg exists.
 #pycompile_dirs="usr/lib/totem/plugins"
-short_desc="A GNOME2 integrated movie player based on Gstreamer"
+short_desc="A GNOME integrated movie player based on Gstreamer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
 license="custom, GPL-2"
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
-checksum=fce76e3c924d0ffd3d4eef2e69af4c44b3537b26c2df86745e900b4c829b38db
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=e767da34f5212bd9b2d3ea9bc7e3a87b284581ee012214274225dd8decb8fe3e
 long_desc="
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats. It features :
diff --git a/srcpkgs/totem/totem-devel.template b/srcpkgs/totem/totem-devel.template
index a9d2e9a6c9c..53b21d5c00b 100644
--- a/srcpkgs/totem/totem-devel.template
+++ b/srcpkgs/totem/totem-devel.template
@@ -1,12 +1,11 @@
 # Template file for 'totem-devel'.
 #
-depends="gtk+3-devel totem-pl-parser-devel totem>=3.4.2"
+depends="gtk+3-devel totem-pl-parser-devel totem>=${version}"
 short_desc="${sourcepkg} - development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
 noarch=yes
 
 do_install() {
diff --git a/srcpkgs/totem/totem-mozilla-plugin.rshlibs b/srcpkgs/totem/totem-mozilla-plugin.rshlibs
index 80b1ed4269c..74258d4125d 100644
--- a/srcpkgs/totem/totem-mozilla-plugin.rshlibs
+++ b/srcpkgs/totem/totem-mozilla-plugin.rshlibs
@@ -1,3 +1,5 @@
+libgmodule-2.0.so.0
+librt.so.1
 libX11.so.6
 libtotem-plparser-mini.so.17
 libgio-2.0.so.0
diff --git a/srcpkgs/totem/totem.rshlibs b/srcpkgs/totem/totem.rshlibs
index 5390e54a16c..01eee3fa9fc 100644
--- a/srcpkgs/totem/totem.rshlibs
+++ b/srcpkgs/totem/totem.rshlibs
@@ -1,58 +1,46 @@
-libclutter-gst-1.0.so.0
-libmx-1.0.so.2
-libgstinterfaces-0.10.so.0
-libgstvideo-0.10.so.0
-libgstaudio-0.10.so.0
-libgstpbutils-0.10.so.0
 libm.so.6
-libtotem-plparser.so.17
-libgsttag-0.10.so.0
-libgstreamer-0.10.so.0
+libgstpbutils-1.0.so.0
+libgsttag-1.0.so.0
+libgstaudio-1.0.so.0
+libgstvideo-1.0.so.0
+libgstreamer-1.0.so.0
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
+libcogl.so.11
+libX11.so.6
 libgtk-3.so.0
-libgdk-3.so.0
 libatk-1.0.so.0
+libtotem-plparser.so.17
 libgio-2.0.so.0
+libgdk-3.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo.so.2
 libdbus-glib-1.so.2
-libpthread.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
-libXtst.so.6
-libX11.so.6
+libpthread.so.0
 libc.so.6
-libgstbase-0.10.so.0
-libpeas-gtk-1.0.so.0
-libpeas-1.0.so.0
-libgirepository-1.0.so.1
-libffi.so.5
-libxml2.so.2
+libclutter-gst-2.0.so.0
+libgstbase-1.0.so.0
+libgthread-2.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
-libdrm.so.2
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
 libXfixes.so.3
+libpeas-gtk-1.0.so.0
+libpeas-1.0.so.0
 libpangocairo-1.0.so.0
 libcairo-gobject.so.2
 libpango-1.0.so.0
 libgmodule-2.0.so.0
 librt.so.1
+libgirepository-1.0.so.1
 libSM.so.6
 libICE.so.6
 libnautilus-extension.so.1
-libepc-ui-1.0.so.3
-libepc-1.0.so.3
-libavahi-common.so.3
-libavahi-client.so.3
-libavahi-glib.so.1
-libsoup-2.4.so.1
-libdbus-1.so.3
-libgrilo-0.1.so.0
-libgnutls.so.26
-libclutter-1.0.so.0
-libcogl.so.9
+libxml2.so.2
+libzeitgeist-1.0.so.1
+libgrilo-0.2.so.1