diff --git a/srcpkgs/totem/libtotem.template b/srcpkgs/totem/libtotem.template
index 92632b53b41..d763ca40de2 100644
--- a/srcpkgs/totem/libtotem.template
+++ b/srcpkgs/totem/libtotem.template
@@ -1,10 +1,6 @@
 # Template file for 'libtotem'.
 #
-short_desc="${sourcepkg} - runtime library"
-long_desc="${long_desc}
-
- This package contains the runtime library."
-
+short_desc="${short_desc} - runtime library"
 replaces="totem<3.6.2"
 
 do_install() {
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 4e06f9f96a6..9e2a91fe750 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -1,29 +1,13 @@
 # Template file for 'totem'
 pkgname=totem
-version=3.6.3
+version=3.8.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-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 gst-plugins-bad1-devel>=1.0.2 gobject-introspection"
-depends="grilo-plugins>=0.2.0 hicolor-icon-theme desktop-file-utils gst-libav"
-fulldepends="gst-plugins-ugly1 gst-plugins-good1"
-# XXX xulrunner plugin.
-subpackages="libtotem totem-devel totem-mozilla-plugin"
-# XXX reenable python plugin if pylint pkg exists.
-#pycompile_dirs="usr/lib/totem/plugins"
 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.6/$pkgname-$version.tar.xz"
-checksum=ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60
+distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz"
+checksum=74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039
 long_desc="
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats. It features :
@@ -46,3 +30,25 @@ long_desc="
    * Works on remote displays
    * DVD, VCD and OGG/OGM subtitles with automatic language selection
    * Extensible with plugins"
+
+build_style=gnu-configure
+configure_args="--disable-static --disable-schemas-compile
+ --disable-python --enable-nautilus"
+
+hostmakedepends="which pkg-config intltool gnome-doc-utils
+ itstool gobject-introspection"
+
+makedepends="gnutls-devel gst-plugins-base1-devel totem-pl-parser-devel
+ libbluetooth-devel evolution-data-server-devel>=3.8.0 dbus-glib-devel
+ clutter-gst-devel>=2.0.2_2 clutter-gtk-devel>=1.4.4
+ libpeas-devel libXtst-devel grilo-devel>=0.2.0 libepc-devel vala-devel>=0.20
+ gst-plugins-bad1-devel>=1.0.0_2 gsettings-desktop-schemas-devel>=3.8.0
+ libzeitgeist-devel nautilus-devel>=3.8.0"
+
+depends="grilo-plugins>=0.2.0 hicolor-icon-theme desktop-file-utils gst-libav"
+fulldepends="gst-plugins-ugly1 gst-plugins-good1"
+
+# XXX xulrunner plugin.
+subpackages="libtotem totem-devel totem-mozilla-plugin"
+# XXX reenable python plugin if pylint pkg exists.
+#pycompile_dirs="usr/lib/totem/plugins"
diff --git a/srcpkgs/totem/totem-devel.template b/srcpkgs/totem/totem-devel.template
index 66862a3431b..c79caec225a 100644
--- a/srcpkgs/totem/totem-devel.template
+++ b/srcpkgs/totem/totem-devel.template
@@ -1,12 +1,7 @@
 # Template file for 'totem-devel'.
 #
 depends="gtk+3-devel totem-pl-parser-devel libtotem-${version}_${revision}"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
+short_desc="${short_desc} - development files"
 
 do_install() {
 	vmove usr/include usr