diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 75fdb60e84b..ece8f1041f8 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -170,6 +170,7 @@
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
+  sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
new file mode 100644
index 00000000000..da7799900a3
--- /dev/null
+++ b/pkgs/tools/text/grin/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "grin-1.2.1";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/g/grin/${name}.tar.gz";
+    sha256 = "1swzwb17wibam8jszdv98h557hlx44pg6psv6rjz7i33qlxk0fdz";
+  };
+
+  buildInputs = with pythonPackages; [ nose ];
+  propagatedBuildInputs = with pythonPackages; [ argparse ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/grin;
+    description = "A grep program configured the way I like it.";
+    platform = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.sjagoe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aea7c663816..d8717ff9fc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1461,6 +1461,8 @@ let
    */
   graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { };
 
+  grin = callPackage ../tools/text/grin { };
+
   grive = callPackage ../tools/filesystems/grive {
     json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b41732005bf..0fbb4ccbe07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5073,7 +5073,6 @@ let
     };
   };
 
-
   gyp = buildPythonPackage rec {
     rev = "1977";
     name = "gyp-r${rev}";
@@ -13765,7 +13764,7 @@ let
       license = licenses.mit;
     };
   };
-  
+
   html2text = buildPythonPackage rec {
     name = "html2text-2014.12.29";