diff --git a/common/shlibs b/common/shlibs
index 5101574f8ed..8b185d213f4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -762,8 +762,6 @@ libv4l1.so.0 v4l-utils-0.8.5_1
 libclutter-gst-1.0.so.0 clutter-gst-1.5.4_1
 libmx-1.0.so.2 mx-1.4.3_1_1
 libmx-gtk-1.0.so.0 mx-1.4.3_1_1
-libcheese.so.3 libcheese-3.3.92_1
-libcheese-gtk.so.21 libcheese-3.3.92_1
 libjson.so.0 json-c-0.9_1
 libcogl.so.11 cogl-1.12.0_1
 libcogl-pango.so.0 cogl-1.12.0_1
@@ -1050,3 +1048,5 @@ libcolord-gtk.so.1 colord-gtk-0.1.23_1
 libgdm.so.1 libgdm-3.6.0_1
 libgdmsimplegreeter.so.1 gdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
+libcheese.so.7 libcheese-3.6.0_1
+libcheese-gtk.so.23 libcheese-3.6.0_1
diff --git a/srcpkgs/cheese/cheese-devel.template b/srcpkgs/cheese/cheese-devel.template
index 1022bf9ea28..330f8dec648 100644
--- a/srcpkgs/cheese/cheese-devel.template
+++ b/srcpkgs/cheese/cheese-devel.template
@@ -1,12 +1,12 @@
 # Template file for 'cheese-devel'.
 #
-depends="gst-plugins-base-devel libcanberra-devel clutter-gst-devel clutter-gtk-devel libcheese>=3.4.2"
+depends="gst-plugins-base1-devel libcanberra-devel clutter-gst-devel>=1.9.92
+clutter-gtk-devel>=1.3.2 libcheese>=${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/cheese/cheese.rshlibs b/srcpkgs/cheese/cheese.rshlibs
index 595e1a1ce63..dbdcaa189f9 100644
--- a/srcpkgs/cheese/cheese.rshlibs
+++ b/srcpkgs/cheese/cheese.rshlibs
@@ -1,6 +1,10 @@
-libgstreamer-0.10.so.0
-libgnome-desktop-3.so.2
+libcheese.so.7
+libcheese-gtk.so.23
+libgstreamer-1.0.so.0
+libgthread-2.0.so.0
+libgnome-desktop-3.so.4
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
 libgee.so.2
 libcanberra-gtk3.so.0
 libgtk-3.so.0
@@ -8,10 +12,6 @@ libgdk-3.so.0
 libgio-2.0.so.0
 libgdk_pixbuf-2.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libcheese.so.3
-libcheese-gtk.so.21
-libclutter-1.0.so.0
diff --git a/srcpkgs/cheese/libcheese.rshlibs b/srcpkgs/cheese/libcheese.rshlibs
index 0bd2b409082..dcc3c104993 100644
--- a/srcpkgs/cheese/libcheese.rshlibs
+++ b/srcpkgs/cheese/libcheese.rshlibs
@@ -1,21 +1,24 @@
-libclutter-gst-1.0.so.0
-libgstbase-0.10.so.0
-libgstreamer-0.10.so.0
-libxml2.so.2
-libmx-1.0.so.2
-libgstinterfaces-0.10.so.0
-libgnome-desktop-3.so.2
+libgstpbutils-1.0.so.0
+libgstphotography-1.0.so.0
+libclutter-gst-2.0.so.0
+libgstbase-1.0.so.0
+libgstreamer-1.0.so.0
+libgthread-2.0.so.0
+libgnome-desktop-3.so.4
 librsvg-2.so.2
 libm.so.6
 libclutter-gtk-1.0.so.0
+libclutter-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
 libXi.so.6
-libdrm.so.2
+libcogl.so.11
 libX11.so.6
 libXext.so.6
 libXdamage.so.1
 libXcomposite.so.1
+libgmodule-2.0.so.0
+librt.so.1
 libXfixes.so.3
 libgee.so.2
 libcanberra-gtk3.so.0
@@ -27,15 +30,10 @@ libgio-2.0.so.0
 libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
 libcairo-gobject.so.2
-libcairo.so.2
 libpango-1.0.so.0
-libgmodule-2.0.so.0
+libcairo.so.2
 libgudev-1.0.so.0
 libgobject-2.0.so.0
-libgthread-2.0.so.0
-librt.so.1
 libglib-2.0.so.0
 libpthread.so.0
 libc.so.6
-libclutter-1.0.so.0
-libcogl.so.9
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 9469e6427a6..663902438cd 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,18 +1,23 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.4.2
-distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
+version=3.6.0
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-schemas-compile"
 depends="desktop-file-utils hicolor-icon-theme nautilus-sendto"
-makedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection gst-plugins-base-devel clutter-gtk-devel clutter-gst-devel mx-devel libgee-devel libcanberra-devel librsvg-devel gnome-desktop-devel"
-fulldepends="gst-plugins-good gst-plugins-bad gnome-video-effects gsettings-desktop-schemas"
-revision=2
+makedepends="which pkg-config intltool gnome-doc-utils itstool
+gobject-introspection gst-plugins-base1-devel clutter-gtk-devel>=1.3.2
+clutter-gst-devel>=1.9.92 mx-devel libgee-devel libcanberra-devel
+librsvg-devel gnome-desktop-devel>=3.6.0 libgudev-devel
+gsettings-desktop-schemas-devel>=3.6.0 gst-plugins-bad1-devel"
+fulldepends="gst-plugins-good1 gnome-video-effects
+gsettings-desktop-schemas>=3.6.0"
 short_desc="GNOME tool to take pictures and videos from your webcam"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org/projects/cheese/"
 license="GPL-2"
-checksum=730083e1fb7da1fc8c38978cbb957ff2128d6f132132b3863bd60c0963a120e0
+distfiles="${GNOME_SITE}/$pkgname/3.6/$pkgname-$version.tar.xz"
+checksum=f0872c6c276fabf054e37e427cb4a4174351a439ebfae7431ecc09a1837e9a80
 long_desc="
  A webcam application that supports image and video capture. Makes it easy to
  take photos and videos of you, your friends, pets or whatever you want. Allows
@@ -21,6 +26,3 @@ long_desc="
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
 subpackages="lib${pkgname} ${pkgname}-devel"
-
-
-