diff --git a/pkgs/applications/editors/emacs-modes/flycheck/default.nix b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
new file mode 100644
index 000000000000..98eab4d477c7
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/flycheck/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, emacs, let-alist, dash, texinfo }:
+
+stdenv.mkDerivation {
+  name = "flycheck-0.22-64-g90dbc2d";
+
+  src = fetchFromGitHub {
+    owner = "flycheck";
+    repo = "flycheck";
+    rev = "90dbc2d";
+    sha256 = "08bg4jps6hjldbcrvqarrwdv4xzirm5pns5s0331wm0sc47yvbli";
+  };
+
+  buildInputs = [ emacs texinfo ];
+
+  buildPhase = ''
+    emacs -L ${let-alist}/share/emacs/site-lisp -L ${dash}/share/emacs/site-lisp --batch -f batch-byte-compile flycheck.el
+    makeinfo --force --no-split -o doc/flycheck.info doc/flycheck.texi
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/emacs/site-lisp $out/share/info
+    mv flycheck.el flycheck.elc $out/share/emacs/site-lisp/
+    mv "doc/"*.info $out/share/info/
+  '';
+
+  meta = {
+    homepage = "https://github.com/magit/git-modes";
+    description = "Emacs modes for various Git-related files";
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ simons ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 751221951ab5..4ce077904a60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9803,6 +9803,8 @@ let
 
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
+    flycheck = callPackage ../applications/editors/emacs-modes/flycheck { };
+
     flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
 
     gh = callPackage ../applications/editors/emacs-modes/gh { };