diff --git a/srcpkgs/cinnamon/cinnamon.rshlibs b/srcpkgs/cinnamon/cinnamon.rshlibs
index e5a802e3c4..7ee1771d5b 100644
--- a/srcpkgs/cinnamon/cinnamon.rshlibs
+++ b/srcpkgs/cinnamon/cinnamon.rshlibs
@@ -13,13 +13,7 @@ libgdk-3.so.0
 libcairo.so.2
 libgjs.so.0
 libmozjs185.so.1.0
-libplds4.so
-libplc4.so
-libnspr4.so
-libdl.so.2
 libgnome-menu-3.so.0
-libgconf-2.so.4
-libsoup-2.4.so.1
 libGL.so.1
 libstartup-notification-1.so.0
 libcanberra.so.0
@@ -27,28 +21,20 @@ libpolkit-agent-1.so.0
 libpolkit-gobject-1.so.0
 libnm-glib.so.4
 libnm-util.so.2
-libdbus-1.so.3
 libgnome-keyring.so.0
 libgnome-bluetooth-applet.so.0
 libm.so.6
 libclutter-1.0.so.0
 libcogl-pango.so.0
 libjson-glib-1.0.so.0
-libXi.so.6
 libcogl.so.11
-libXext.so.6
-libXdamage.so.1
-libXcomposite.so.1
 libgmodule-2.0.so.0
-librt.so.1
 libXfixes.so.3
 libcroco-0.6.so.3
 libxml2.so.2
 libgnome-desktop-3.so.4
 libatk-1.0.so.0
 libpangocairo-1.0.so.0
-libcairo-gobject.so.2
 libpango-1.0.so.0
-libgthread-2.0.so.0
 libpulse-mainloop-glib.so.0
 libpulse.so.0
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 7cdf71a6fb..77ee995062 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -1,26 +1,24 @@
 # Template file for 'cinnamon'
 pkgname=cinnamon
-version=1.6.0
-revision=6
-wrksrc="linuxmint-Cinnamon-bd02368"
+version=1.6.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-compile --enable-compile-warnings=yes
---disable-static --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
-makedepends="which gnome-common gettext-devel automake gnome-doc-utils
-pkg-config intltool glib-devel dbus-glib-devel libxml2-devel gtk+3-devel>=3.6.0_2
-libmuffin-devel>=1.1.0_2 gjs-devel gnome-menus-devel>=3.6.0 GConf-devel libsoup-devel
-MesaLib-devel cogl-devel>=1.12 clutter-devel>=1.12 startup-notification-devel libcanberra-devel
-polkit-devel NetworkManager-devel libgnome-keyring-devel>=3.6.0 libcroco-devel
-gnome-desktop-devel>=3.6.0 gnome-bluetooth-devel>=3.6.0 pulseaudio-devel gobject-introspection"
-depends="desktop-file-utils caribou pulseaudio mesa-demos muffin>=1.1.0
-python-gconf python-lxml python-imaging"
-fulldepends="gsettings-desktop-schemas"
+ --disable-static --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
+makedepends="git which gnome-common gettext-devel automake gnome-doc-utils
+ pkg-config intltool glib-devel dbus-glib-devel libxml2-devel gtk+3-devel>=3.6.0_2
+ libmuffin-devel>=1.1.1 gjs-devel gnome-menus-devel>=3.6.0 GConf-devel
+ libsoup-devel libcanberra-devel gobject-introspection libcroco-devel
+ MesaLib-devel cogl-devel>=1.12 clutter-devel>=1.12 startup-notification-devel
+ polkit-devel NetworkManager-devel libgnome-keyring-devel>=3.6.0
+ gnome-desktop-devel>=3.6.0 gnome-bluetooth-devel>=3.6.0 pulseaudio-devel
+ gsettings-desktop-schemas-devel>=3.6.0"
+depends="desktop-file-utils caribou pulseaudio mesa-demos muffin>=1.1.1
+ python-gconf python-lxml python-imaging"
 short_desc="The Cinnamon desktop (gnome-shell fork)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://cinnamon.linuxmint.com/"
-distfiles="http://xbps.nopcode.org/distfiles/${pkgname}-${version}.tar.gz"
-checksum=905783fb3e12bc159f6a715800e974e292fb31478a3478eb2775670f2d4db4f3
 long_desc="
  Cinnamon is a Linux desktop which provides advanced innovative features and
  a traditional user experience.
@@ -30,9 +28,18 @@ long_desc="
  The emphasis is put on making users feel at home and providing them with an
  easy to use and comfortable desktop experience."
 
+nofetch=yes
+noextract=yes
+
 pycompile_dirs="usr/lib/cinnamon-settings usr/lib/cinnamon-menu-editor"
 LDFLAGS="-lgthread-2.0"
 
+do_fetch() {
+	local url="git://github.com/linuxmint/Cinnamon.git"
+	msg_normal "Fetching source from $url ...\n"
+        git clone -b ${version} $url ${pkgname}-${version}
+}
+
 pre_configure() {
 	_cur="/usr/lib/gnome-session/gnome-session-check-accelerated"
 	_new="/usr/libexec/gnome-session-check-accelerated"