diff --git a/srcpkgs/cheese/cheese-devel.template b/srcpkgs/cheese/cheese-devel.template
index 91c849bb254..0defda2f915 100644
--- a/srcpkgs/cheese/cheese-devel.template
+++ b/srcpkgs/cheese/cheese-devel.template
@@ -5,15 +5,9 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run gnome-desktop-devel
 Add_dependency run gst-plugins-base-devel
-Add_dependency run clutter-gtk-devel
-Add_dependency run clutter-gst-devel
-Add_dependency run mx-devel
-Add_dependency run libgee-devel
 Add_dependency run libcanberra-devel
-Add_dependency run librsvg-devel
-Add_dependency run cheese
+Add_dependency run libcheese
 
 do_install()
 {
diff --git a/srcpkgs/cheese/libcheese.template b/srcpkgs/cheese/libcheese.template
new file mode 100644
index 00000000000..a67db2d7f80
--- /dev/null
+++ b/srcpkgs/cheese/libcheese.template
@@ -0,0 +1,45 @@
+# Template file for 'libcheese'.
+#
+short_desc="${sourcepkg} - shared libraries"
+long_desc="${long_desc}
+
+ This package contains the shared libraries."
+
+replaces="cheese<3.2.1"
+
+Add_dependency run glibc
+Add_dependency run clutter-gst
+Add_dependency run gstreamer
+Add_dependency run libxml2
+Add_dependency run mx
+Add_dependency run gst-plugins-base
+Add_dependency run gnome-desktop
+Add_dependency run librsvg
+Add_dependency run clutter-gtk
+Add_dependency run clutter
+Add_dependency run cogl
+Add_dependency run json-glib
+Add_dependency run MesaLib
+Add_dependency run libXi
+Add_dependency run libdrm
+Add_dependency run libX11
+Add_dependency run libXext
+Add_dependency run libXdamage
+Add_dependency run libXcomposite
+Add_dependency run libXfixes
+Add_dependency run libgee
+Add_dependency run libcanberra
+Add_dependency run gtk+3
+Add_dependency run atk
+Add_dependency run glib
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run cairo
+Add_dependency run freetype
+Add_dependency run fontconfig
+Add_dependency run libgudev
+
+do_install()
+{
+	vmove "usr/lib/*.so*" usr/lib
+}
diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template
index 8f7c8c0980d..4e9ef4101d0 100644
--- a/srcpkgs/cheese/template
+++ b/srcpkgs/cheese/template
@@ -1,6 +1,6 @@
 # Template file for 'cheese'
 pkgname=cheese
-version=3.2.0
+version=3.2.1
 distfiles="${GNOME_SITE}/$pkgname/3.2/$pkgname-$version.tar.xz"
 build_style=gnu_configure
 configure_args="--disable-scrollkeeper
@@ -9,7 +9,7 @@ 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=04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b
+checksum=0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c
 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
@@ -17,41 +17,19 @@ long_desc="
  features such as Multi-Burst mode, Countdown timer for photos."
 
 gtk_iconcache_dirs="/usr/share/icons/hicolor"
-subpackages="$pkgname-devel"
+subpackages="lib${pkgname} ${pkgname}-devel"
 
 Add_dependency run glibc
-Add_dependency run clutter-gst
+Add_dependency run libcheese
 Add_dependency run gstreamer
-Add_dependency run libxml2
-Add_dependency run mx
-Add_dependency run clutter
-Add_dependency run cairo
-Add_dependency run atk
-Add_dependency run pango
-Add_dependency run json-glib
-Add_dependency run gdk-pixbuf
-Add_dependency run libpng
-Add_dependency run MesaLib
-Add_dependency run libdrm
-Add_dependency run libX11
-Add_dependency run libXext
-Add_dependency run libXdamage
-Add_dependency run libXcomposite
-Add_dependency run libXi
-Add_dependency run glib
-Add_dependency run libXfixes
-Add_dependency run libgudev
-Add_dependency run gst-plugins-base
 Add_dependency run gnome-desktop
-Add_dependency run startup-notification
-Add_dependency run librsvg
 Add_dependency run clutter-gtk
+Add_dependency run clutter
 Add_dependency run libgee
 Add_dependency run libcanberra
 Add_dependency run gtk+3
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run cogl
+Add_dependency run glib
+Add_dependency run gdk-pixbuf
 
 Add_dependency run gst-plugins-good
 Add_dependency run gst-plugins-bad
diff --git a/srcpkgs/libcheese b/srcpkgs/libcheese
new file mode 120000
index 00000000000..eb26474016f
--- /dev/null
+++ b/srcpkgs/libcheese
@@ -0,0 +1 @@
+cheese
\ No newline at end of file
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 030f1fbf6c4..574bfa1b56e 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -829,8 +829,8 @@ libv4l1.so.0			v4l-utils		v4l-utils-devel
 libclutter-gst-1.0.so.0		clutter-gst		clutter-gst-devel
 libmx-1.0.so.2			mx			mx-devel
 libmx-gtk-1.0.so.0		mx			mx-devel
-libcheese.so.1			cheese			cheese-devel
-libcheese-gtk.so.20		cheese			cheese-devel
+libcheese.so.1			libcheese		cheese-devel
+libcheese-gtk.so.20		libcheese		cheese-devel
 libjson.so.0			json-c			json-c-devel
 libcogl.so.5			cogl			cogl-devel
 libcogl-pango.so.0		cogl			cogl-devel