diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index 7c2a597d..b60341fa 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -38,7 +38,9 @@
   };
 
   home.packages = with pkgs; [
+    count-tags
     create-script
+    get-tags
     tag-release
     time-until
     update-all-git-repos
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 0572b0c4..a1016614 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -99,8 +99,10 @@
   home.packages = with pkgs; [
     backup-websites
     build-glove80
+    count-tags
     create-script
     displayselect
+    get-tags
     qrencode
     mounter
     move-firefox-screenshots
diff --git a/packages/count-tags.nix b/packages/count-tags.nix
new file mode 100755
index 00000000..c5e046fa
--- /dev/null
+++ b/packages/count-tags.nix
@@ -0,0 +1,14 @@
+{ pkgs }:
+
+pkgs.writeShellApplication {
+  name = "count-tags";
+
+  runtimeInputs = with pkgs; [
+    coreutils
+    get-tags
+  ];
+
+  text = ''
+    get-tags "''${1:-}" | wc -l
+  '';
+}
diff --git a/packages/default.nix b/packages/default.nix
index ef78b7b3..dd072b6e 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -9,9 +9,11 @@ in
   _timer = callPackage ./_timer.nix { };
   backup-websites = callPackage ./backup-websites.nix { };
   build-glove80 = callPackage ./build-glove80.nix { };
+  count-tags = callPackage ./count-tags.nix { };
   create-script = callPackage ./create-script.nix { };
   dev-commit = callPackage ./dev-commit.nix { };
   displayselect = callPackage ./displayselect { };
+  get-tags = callPackage ./get-tags.nix { };
   git-graph = callPackage ./git-graph.nix { };
   mounter = callPackage ./mounter.nix { };
   move-firefox-screenshots = callPackage ./move-firefox-screenshots.nix { };
diff --git a/packages/get-tags.nix b/packages/get-tags.nix
new file mode 100755
index 00000000..b05a6643
--- /dev/null
+++ b/packages/get-tags.nix
@@ -0,0 +1,19 @@
+{ pkgs }:
+
+pkgs.writeShellApplication {
+  name = "get-tags";
+
+  runtimeInputs = with pkgs; [
+    git
+    unixtools.column
+  ];
+
+  text = ''
+    if [[ "$#" -gt 0 ]]; then
+      git tag | grep "$*"
+      exit 0
+    fi
+
+    git tag
+  '';
+}