diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
index 4d1dd54bba6..70543b5fa18 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, qt4 }:
+{ lib, stdenv, fetchFromGitHub, qt4 }:
 
 stdenv.mkDerivation rec {
   pname = "xkblayout-state";
   version = "1b";
 
-  src = fetchurl {
-    url = "https://github.com/nonpop/${pname}/archive/v${version}.tar.gz";
-    sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx";
+  src = fetchFromGitHub {
+    owner = "nonpop";
+    repo = "xkblayout-state";
+    rev = "v${version}";
+    sha256 = "sha256-diorqwDEBdzcBteKvhRisQaY3bx5seaOaWSaPwBkWDo=";
   };
 
   buildInputs = [ qt4 ];