diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3b90bbf7075b..81c7b6dbc8a3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6779,6 +6779,12 @@
     githubId = 127353;
     name = "Geoffrey Huntley";
   };
+  gigahawk = {
+    email = "Jasper Chan";
+    name = "jasperchan515@gmail.com";
+    github = "Gigahawk";
+    githubId = 10356230;
+  };
   gigglesquid = {
     email = "jack.connors@protonmail.com";
     github = "gigglesquid";
diff --git a/pkgs/by-name/xm/xmpp-bridge/package.nix b/pkgs/by-name/xm/xmpp-bridge/package.nix
new file mode 100644
index 000000000000..ed11cccfeab5
--- /dev/null
+++ b/pkgs/by-name/xm/xmpp-bridge/package.nix
@@ -0,0 +1,49 @@
+{ lib
+, fetchFromGitHub
+, stdenv
+, pkg-config
+, libstrophe
+, installShellFiles
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xmpp-bridge";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "majewsky";
+    repo = "xmpp-bridge";
+    rev = "v${version}";
+    hash = "sha256-JXhVi2AiV/PmWPfoQJl/N92GAZQ9UxReAiCkiDxgdFY=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
+
+  buildInputs = [
+    libstrophe
+  ];
+
+  strictDeps  = true;
+
+  # Makefile is hardcoded to install to /usr, install manually
+  installPhase = ''
+    runHook  preInstall
+
+    install -D -m 0755 build/xmpp-bridge "$out/bin/xmpp-bridge"
+    installManPage xmpp-bridge.1
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Connect command-line programs to XMPP";
+    homepage = "https://github.com/majewsky/xmpp-bridge";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "xmpp-bridge";
+    maintainers = with lib.maintainers; [ gigahawk ];
+    platforms = lib.platforms.unix;
+  };
+}