diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index d17093695114..ab32674f1881 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchgit, pythonPackages }:
+{ lib, fetchFromGitHub, pythonPackages }:
 
-pythonPackages.buildPythonApplication {
+pythonPackages.buildPythonApplication rec {
+  pname = "grabserial";
+  version = "1.9.8";
 
-  name = "grabserial-1.9.3";
-  namePrefix = "";
-
-  src = fetchgit {
-    url = https://github.com/tbird20d/grabserial.git;
-    rev  = "7cbf104b61ffdf68e6782a8e885050565399a014";
-    sha256 = "043r2p5jw0ymx8ka1d39q1ap39i7sliq5f4w3yr1n53lzshjmc5g";
+  src = fetchFromGitHub {
+    owner = "tbird20d";
+    repo = "grabserial";
+    rev = "v${version}";
+    sha256 = "1xmy3js4hzsxlkxc172hkjzxsc34mmg3vfz61h24c7svmfzyhbd5";
   };
 
   propagatedBuildInputs = [ pythonPackages.pyserial ];
 
-  meta = {
+  meta = with lib; {
     description = "Python based serial dump and timing program";
-    homepage = https://github.com/tbird20d/grabserial;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ vmandela ];
-    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/tbird20d/grabserial";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ vmandela ];
+    platforms = platforms.linux;
   };
 }