diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
new file mode 100644
index 000000000000..2636bc9e7990
--- /dev/null
+++ b/pkgs/games/sienna/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "sienna";
+  version = "1.0c";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/sienna.png";
+    sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "sienna";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Fast-paced one button platformer"; 
+    desktopName = "Sienna";
+    genericName = "sienna";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
+    sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v $src $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast-paced one button platformer";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/sienna;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f438..5c6c79887568 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14633,6 +14633,8 @@ let
 
   sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
 
+  sienna = callPackage ../games/sienna { love = love_0_10; };
+
   simutrans = callPackage ../games/simutrans { };
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;