diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cc686617e69b..e39c3e98574b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -26047,6 +26047,12 @@
     matrix = "@superherointj:matrix.org";
     name = "Sérgio Marcelo";
   };
+  supermarin = {
+    email = "git+nixpkgs@mar.in";
+    name = "marin";
+    github = "supermarin";
+    githubId = 627285;
+  };
   SuperSandro2000 = {
     email = "sandro.jaeckel@gmail.com";
     matrix = "@sandro:supersandro.de";
diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix
new file mode 100644
index 000000000000..db3432b6a44b
--- /dev/null
+++ b/pkgs/by-name/cl/cliamp/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  pkg-config,
+  makeWrapper,
+  alsa-lib,
+  libogg,
+  libvorbis,
+  ffmpeg,
+  flac,
+  yt-dlp,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "cliamp";
+  version = "1.20.1";
+
+  src = fetchFromGitHub {
+    owner = "bjarneo";
+    repo = "cliamp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jT9nc2oBsQxJfDgncdnf668IzkUsvXI2G8DZNGQcWr0=";
+  };
+
+  vendorHash = "sha256-UMDCpfSGfvJmI+sImaFzgZpLNaLMgEnmGCqERwPokHM=";
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    alsa-lib
+    libogg
+    libvorbis
+    flac
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/cliamp \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          ffmpeg
+          yt-dlp
+        ]
+      }
+  '';
+
+  meta = {
+    description = "Terminal Winamp - a retro terminal music player inspired by Winamp 2.x";
+    homepage = "https://github.com/bjarneo/cliamp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ supermarin ];
+    mainProgram = "cliamp";
+  };
+})