diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30dc99c21a59..e8f8942ca414 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7125,6 +7125,16 @@
       fingerprint = "A3A3 65AE 16ED A7A0 C29C  88F1 9712 452E 8BE3 372E";
     }];
   };
+  pinpox = {
+    email = "mail@pablo.tools";
+    github = "pinpox";
+    githubId = 1719781;
+    name = "Pablo Ovelleiro Corral";
+    keys = [{
+      longkeyid = "sa4096/0x823A6154426408D3";
+      fingerprint = "D03B 218C AE77 1F77 D7F9  20D9 823A 6154 4264 08D3";
+    }];
+  };
   piotr = {
     email = "ppietrasa@gmail.com";
     name = "Piotr Pietraszkiewicz";
diff --git a/pkgs/servers/fiche/default.nix b/pkgs/servers/fiche/default.nix
new file mode 100644
index 000000000000..10ce1c30a0cf
--- /dev/null
+++ b/pkgs/servers/fiche/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "fiche";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "solusipse";
+    repo = "fiche";
+    rev = version;
+    sha256 = "1102r39xw17kip7mjp987jy8na333gw9vxv31f7v8q05cr7d7kfb";
+  };
+
+  installPhase = ''
+    install -Dm755 fiche -t $out/bin
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Command line pastebin for sharing terminal output";
+    longDescription = ''
+      Fiche is a command line pastebin server for sharing terminal output.
+      It can be used without any graphical tools from a TTY and has minimal requirements.
+      A live instance can be found at https://termbin.com.
+
+      Example usage:
+      echo just testing! | nc termbin.com 9999
+    '';
+
+    homepage = "https://github.com/solusipse/fiche";
+    changelog = "https://github.com/solusipse/fiche/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = [ maintainers.pinpox ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5edac9ecdb33..eb049d9923db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -150,6 +150,8 @@ in
 
   ankisyncd = callPackage ../servers/ankisyncd { };
 
+  fiche = callPackage ../servers/fiche { };
+
   avro-tools = callPackage ../development/tools/avro-tools { };
 
   bacnet-stack = callPackage ../tools/networking/bacnet-stack {};