diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
index cc825f0cc6c5..bcabd9140a86 100644
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -32,6 +32,8 @@ let
     nautilus-sendto dconf-editor vinagre
   ];
 
+  gamesPackages = with gnome3; [ swell-foop ];
+
   inherit (pkgs) libsoup glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
   inherit (pkgs.gnome2) ORBit2;
   orbit = ORBit2;
@@ -279,6 +281,10 @@ let
 
   gdl = callPackage ./devtools/gdl { };
 
+#### Games
+
+  swell-foop = callPackage ./games/swell-foop { };
+
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
   california = callPackage ./misc/california { };
diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
new file mode 100644
index 000000000000..4afe66ee5450
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, makeWrapper
+, clutter, clutter_gtk, intltool, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "swell-foop-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/swell-foop/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0bhjmjcjsqdb89shs0ygi6ps5hb3lk8nhrbjnsjk4clfqbw0jzwf";
+  };
+
+  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
+                  makeWrapper itstool intltool clutter clutter_gtk libxml2 ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/swell-foop" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
+      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
+    description = "Puzzle game, previously known as Same GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}