diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
new file mode 100644
index 000000000000..0c12778089be
--- /dev/null
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, alsaLib, cmake, fftw, freeglut, jack2, libXmu, qt4 }:
+
+stdenv.mkDerivation rec {
+  version = "0.99.5";
+  name = "fmit-${version}";
+
+  src = fetchurl {
+    url = "http://download.gna.org/fmit/${name}-Source.tar.bz2";
+    sha256 = "1rc84gi27jmq2smhk0y0p2xyypmsz878vi053iqns21k848g1491";
+  };
+
+  # Also update longDescription when adding/removing sound libraries
+  buildInputs = [ alsaLib cmake fftw freeglut jack2 libXmu qt4 ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Free Musical Instrument Tuner";
+    longDescription = ''
+      Software for tuning musical instruments. Uses Qt as GUI library and
+      ALSA or JACK as sound input library.
+    '';
+    homepage = http://home.gna.org/fmit/index.html;
+    license = with licenses; gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5f6de26369d..7a6d0efe7f33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9762,6 +9762,8 @@ let
 
   fluidsynth = callPackage ../applications/audio/fluidsynth { };
 
+  fmit = callPackage ../applications/audio/fmit { };
+
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
   fossil = callPackage ../applications/version-management/fossil { };