diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 77466fba6530..067cb675571a 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,5 +1,5 @@
 { stdenv,
-  fetchFromGitHub,
+  fetchgit,
   rustPlatform,
   cmake,
   makeWrapper,
@@ -29,16 +29,19 @@ let
 in
 
 buildRustPackage rec {
-  name = "alacritty-unstable-2017-10-17";
+  name = "alacritty-unstable-${version}";
+  version = "2017-10-22";
 
-  src = fetchFromGitHub {
-    owner = "jwilm";
-    repo = "alacritty";
-    rev = "5ac42bb13bc68c5cbc44869dc9fc9ac19402a6e6";
-    sha256 = "0h37x12r33xwz9vf1n8y24c0ph5w17lhkpfi5q6lbpgidvbs6fyx";
+  # At the moment we cannot handle git dependencies in buildRustPackage.
+  # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
+  src = fetchgit {
+    url = https://github.com/Mic92/alacritty.git;
+    rev = "rev-${version}";
+    sha256 = "02wvwi72hnqmy12n0b248wzhajni9ipyayz6vnn3ryhnrccrrp7j";
+    fetchSubmodules = true;
   };
 
-  cargoSha256 = "0w3j92kd27pny37pfvlv6qsnbb1lgphmfbhvvng0z96r2b1wjviz";
+  cargoSha256 = "14bmm1f7hqh8i4mpb6ljh7szrm4g6mplzpq9zbgjrgxnc01w3s0i";
 
   buildInputs = [
     cmake
@@ -54,14 +57,10 @@ buildRustPackage rec {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/bin
-    for f in $(find target/release -maxdepth 1 -type f); do
-      cp $f $out/bin
-    done;
+    install -D target/release/alacritty $out/bin/alacritty
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
 
-    mkdir -p $out/share/applications
-    cp Alacritty.desktop $out/share/applications/alacritty.desktop
+    install -D Alacritty.desktop $out/share/applications/alacritty.desktop
 
     runHook postInstall
   '';
@@ -69,7 +68,6 @@ buildRustPackage rec {
   dontPatchELF = true;
 
   meta = with stdenv.lib; {
-    broken = true;
     description = "GPU-accelerated terminal emulator";
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];