diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0418337b217b0..285197e381dfe 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -49,6 +49,7 @@
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
+  roelof = "Roelof Wobben <rwobben@hotmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop.nix b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
new file mode 100644
index 0000000000000..045c1a79630a5
--- /dev/null
+++ b/pkgs/desktops/cinnamon/cinnamon-desktop.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, gobjectIntrospection, intltool, gettext, glib, gnome_common,
+libX11, libXrandr, libXext, gtk3, gdk_pixbuf, xkeyboard_config, libxkbfile }:
+
+stdenv.mkDerivation rec {
+  name = "cjs";
+  version="2.0.4";
+
+  src = fetchurl {
+    url = "http://github.com/linuxmint/cinnamon-desktop/archive/${version}.tar.gz";
+    sha256 = "1cywin712558pv58c0cr73m25hfcv5x8pv5frvqjr9gwr2gpi6h3";
+  };
+  
+  preConfigure = ''
+     gio_include_dir="$(echo "${glib}/include"/gio-*/)"
+     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$gio_include_dir"
+    '';
+
+  buildInputs = [
+    pkgconfig autoreconfHook
+    gobjectIntrospection intltool gettext glib
+    gnome_common libX11 libXrandr libXext gtk3
+    gdk_pixbuf xkeyboard_config libxkbfile
+  ];
+
+  preBuild = "patchShebangs ./scripts";
+
+  meta = {
+    homepage = "http://cinnamon.linuxmint.com";
+    description = "cinnamon-desktop contains the libcinnamon-desktop library, the cinnamon-about
+     program as well as some desktop-wide documents." ;
+
+    longDescription = ''
+       cinnamon-desktop contains the libcinnamon-desktop library, the cinnamon-about
+       program as well as some desktop-wide documents.
+
+       The libcinnamon-desktop library provides API shared by several applications
+       on the desktop, but that cannot live in the platform for various
+       reasons. There is no API or ABI guarantee, although we are doing our
+       best to provide stability. Documentation for the API is available with
+       gtk-doc.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.roelof ];
+  };
+}
+
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac304ad462b28..7a2b549dcc982 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9576,6 +9576,12 @@ let
 
   ### DESKTOP ENVIRONMENTS
 
+  cinnamon = recurseIntoAttrs {
+    cjs = callPackage ../desktops/cinnamon/cjs.nix { };
+    cinnamon-desktop = callPackage ../desktops/cinnamon/cinnamon-desktop.nix{
+      inherit(gnome) gnome_common ; };
+ };  
+
   enlightenment = callPackage ../desktops/enlightenment { };
 
   e17 = recurseIntoAttrs (