diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
new file mode 100644
index 000000000000..117574c3daa1
--- /dev/null
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "fsql-${version}";
+  version = "0.1.0";
+
+  goPackagePath = "github.com/kshvmdn/fsql";
+
+  src = fetchgit {
+    rev = "v${version}";
+    url = "https://github.com/kshvmdn/fsql";
+    sha256 = "1wkf9rr6x4b5bvxj9zwfw9hd870c831j7mc6fvd448id653wh122";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Search through your filesystem with SQL-esque queries";
+    homepage = https://github.com/kshvmdn/fsql;
+    license = licenses.mit;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+    inherit version;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23a4bc112452..debd100368b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -969,6 +969,8 @@ with pkgs;
 
   fsmon = callPackage ../tools/misc/fsmon { };
 
+  fsql = callPackage ../tools/misc/fsql { };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   fondu = callPackage ../tools/misc/fondu { };