diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
new file mode 100644
index 000000000000..1c641f55c471
--- /dev/null
+++ b/pkgs/games/freecell-solver/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, cmake, perl, gmp, libtap, perlPackages }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "freecell-solver-${version}";
+  version = "3.26.0";
+
+  src = fetchurl {
+    url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.bz2";
+    sha256 = "0pm6xk4fmwgzva70qxb0pqymdfvpasnvqiwwmm8hpx7g37y11wqk";
+  };
+
+  buildInputs = [ pkgconfig cmake perl gmp libtap
+    perlPackages.TemplateToolkit perlPackages.StringShellQuote
+    perlPackages.GamesSolitaireVerify ];
+
+  meta = {
+    description = "A FreeCell automatic solver";
+    longDescription = ''
+      FreeCell Solver is a program that automatically solves layouts
+      of Freecell and similar variants of Card Solitaire such as Eight
+      Off, Forecell, and Seahaven Towers, as well as Simple Simon
+      boards.
+    '';
+    homepage = http://fc-solve.shlomifish.org/;
+    license = licenses.mit;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 147e89371d32..64ee5c66b9ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13611,6 +13611,8 @@ let
 
   flightgear = callPackage ../games/flightgear { };
 
+  freecell-solver = callPackage ../games/freecell-solver { };
+
   freeciv = callPackage ../games/freeciv { };
 
   freeciv_gtk = callPackage ../games/freeciv {