diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
new file mode 100644
index 00000000000..95230291fe9
--- /dev/null
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit,autoconf, automake, gcc, fltk13
+, libjpeg, libpng, libtool, mesa, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "solvespace-2.0";
+  src = fetchgit {
+    url = "https://gitorious.org/solvespace/solvespace.git";
+    sha256 = "0sakxkmj2f0k27f67wy1xz2skpnwzg15yqrf7av97pgc5s8xb3da";
+    rev = "e587d0e";
+  };
+
+  # e587d0e fails with undefined reference errors if make is called
+  # twice. Ugly workaround: Build while installing.
+  dontBuild = true;
+  enableParallelBuilding = false;
+
+  buildInputs = [        
+    autoconf
+    automake
+    gcc
+    fltk13
+    libjpeg
+    libpng
+    libtool
+    mesa
+    pkgconfig
+    stdenv
+  ];
+
+  preConfigure = ''
+    aclocal
+    libtoolize
+    
+    autoreconf -i
+    automake --add-missing
+  '';
+
+  meta = {
+    description = "A parametric 3d CAD program.";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = http://solvespace.com;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82e999058ff..32ff5ecc00f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2175,6 +2175,8 @@ let
 
   solr = callPackage ../servers/search/solr { };
 
+  solvespace = callPackage ../applications/graphics/solvespace { };
+
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   spiped = callPackage ../tools/networking/spiped { };