diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2946f7cd501..130ace63b4b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -132,6 +132,8 @@ let
     utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
   };
 
+  git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { };
+
   git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
 
   git-remote-hg = callPackage ./git-remote-hg { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix
new file mode 100644
index 00000000000..e5e41ac7232
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, botocore, pytest, mock
+, flake8, tox, awscli }:
+
+buildPythonApplication rec {
+  pname = "git-remote-codecommit";
+  version = "1.15.1";
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = pname;
+    rev = version;
+    sha256 = "1vvp7i8ghmq72v57f6smh441h35xnr5ar628q2mr40bzvcifwymw";
+  };
+
+  propagatedBuildInputs = [ botocore ];
+
+  checkInputs = [ pytest mock flake8 tox awscli ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = {
+    description =
+      "Git remote prefix to simplify pushing to and pulling from CodeCommit";
+    maintainers = [ lib.maintainers.zaninime ];
+    homepage = "https://github.com/awslabs/git-remote-codecommit";
+    license = lib.licenses.asl20;
+  };
+}