diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8ccffd9139b3..028da75188ca 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -241,6 +241,11 @@
     email = "nix-commits@lists.science.uu.nl";
     name = "Nix Committers";
   };
+  allonsy = {
+    email = "linuxbash8@gmail.com";
+    github = "allonsy";
+    name = "Alec Snyder";
+  };
   alunduil = {
     email = "alunduil@gmail.com";
     github = "alunduil";
diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix
new file mode 100644
index 000000000000..afcf9cf4c781
--- /dev/null
+++ b/pkgs/tools/misc/git-town/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }: 
+
+  buildGoPackage rec {
+    name = "git-town-${version}";
+    version = "7.2.0";
+
+    goPackagePath = "github.com/Originate/git-town";
+
+    src = fetchFromGitHub {
+      owner = "Originate";
+      repo = "git-town";
+      rev = "v${version}";
+      sha256 = "0hr0c6iya34lanfhsg9kj03l4ajalcfxkbn4bgwh0749smhi6mrj";
+    };
+
+    buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ];
+
+    meta = with stdenv.lib; {
+      description = "Generic, high-level git support for git-flow workflows";
+      homepage = http://www.git-town.com/;
+      maintainers = [ maintainers.allonsy ];
+      license = licenses.mit;
+    };
+  }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ddd20cc18ab..fb54ee48b1d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -690,6 +690,8 @@ in
 
   git-fire = callPackage ../tools/misc/git-fire { };
 
+  git-town = callPackage ../tools/misc/git-town { };
+
   github-changelog-generator = callPackage ../development/tools/github-changelog-generator { };
 
   gitless = callPackage ../applications/version-management/gitless { };