diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix
index d8d8fe5a02e..68af9388bed 100644
--- a/pkgs/development/libraries/haskell/ghc-mod/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix
@@ -1,14 +1,18 @@
-{ cabal, attoparsec, attoparsecEnumerator, ghcPaths, hlint, regexPosix, emacsPackages }:
+{ cabal, Cabal, emacs, filepath, ghcPaths, ghcSybUtils, hlint
+, ioChoice, regexPosix, syb, transformers
+}:
 
 cabal.mkDerivation (self: {
   pname = "ghc-mod";
-  version = "1.10.5";
-  sha256 = "0hbimrrlasa2rkmdz9d4fcyk70fynmwx0zqyl470hrwz8d8v73rc";
-  buildDepends = [
-    attoparsec attoparsecEnumerator ghcPaths hlint regexPosix
-  ];
-  propagatedBuildInputs = [emacsPackages.emacs emacsPackages.haskellMode];
+  version = "1.10.11";
+  sha256 = "0s2amrikrlcgiy9iw6f1s43k2lzy9jaiddky078qp1pbk68dhbk9";
+  isLibrary = false;
   isExecutable = true;
+  buildDepends = [
+    Cabal filepath ghcPaths ghcSybUtils hlint ioChoice regexPosix syb
+    transformers
+  ];
+  buildTools = [ emacs ];
   postInstall = ''
     cd $out/share/$pname-$version
     make
@@ -20,7 +24,7 @@ cabal.mkDerivation (self: {
 
   meta = {
     homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-    description = "Happy Haskell programming on Emacs";
+    description = "Happy Haskell programming on Emacs/Vim";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
     maintainers = [
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9da648faddb..fe02ffcffe3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -706,7 +706,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   ghcEvents = callPackage ../development/libraries/haskell/ghc-events {};
 
   ghcMod = callPackage ../development/libraries/haskell/ghc-mod {
-    emacsPackages = pkgs.emacs23Packages;
+    inherit (pkgs) emacs;
   };
 
   ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {};