diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
new file mode 100644
index 000000000000..f5d4322ec932
--- /dev/null
+++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }:
+
+stdenv.mkDerivation rec {
+  name = "acoustid-fingerprinter-${version}";
+  version = "0.6";
+
+  src = fetchurl {
+    url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/"
+        + "${name}.tar.gz";
+    sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0";
+  };
+
+  buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ];
+
+  meta = {
+    homepage = "http://acoustid.org/fingerprinter";
+    description = "Audio fingerprinting tool using chromaprint";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60d3855699ca..15590b8448a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -386,6 +386,9 @@ let
 
   acct = callPackage ../tools/system/acct { };
 
+  acoustidFingerprinter = callPackage
+    ../tools/audio/acoustid-fingerprinter { };
+
   aefs = callPackage ../tools/filesystems/aefs { };
 
   aespipe = callPackage ../tools/security/aespipe { };