diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/tools/misc/vcs_query/default.nix
new file mode 100644
index 00000000000..a39619f354b
--- /dev/null
+++ b/pkgs/tools/misc/vcs_query/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, python3, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "vcs_query";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "mageta";
+    repo = "vcs_query";
+    rev = "v${version}";
+    sha256 = "05va0na9yxkpqhm9v0x3k58148qcf2bbcv5bnmj7vn9r7fwyjrlx";
+  };
+
+  nativeBuildInputs = [ python3 python3.pkgs.wrapPython ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -Dm0755 vcs_query.py $out/bin/vcs_query
+    patchShebangs $out/bin
+    buildPythonPath ${python3.pkgs.vobject};
+    patchPythonScript $out/bin/vcs_query
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mageta/vcs_query;
+    description = "eMail query-command to use vCards in mutt and Vim";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7c5eee6847..bab749fca2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6016,6 +6016,8 @@ in
 
   vcsh = callPackage ../applications/version-management/vcsh { };
 
+  vcs_query = callPackage ../tools/misc/vcs_query { };
+
   vcstool = callPackage ../development/tools/vcstool { };
 
   verilator = callPackage ../applications/science/electronics/verilator {};