diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 83ca673e1830..3f7206db361e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11620,6 +11620,13 @@
     githubId = 49811314;
     keys = [ { fingerprint = "CC36 4CF4 32DD 443F 27FC  033C 3475 AA20 D72F 6A93"; } ];
   };
+  jaanonim = {
+    name = "Jaanonim";
+    email = "mat8mro@gmail.com";
+    github = "jaanonim";
+    githubId = 28810058;
+    keys = [ { fingerprint = "5C4A 273F 5F11 3DF7 ECDF  0AD7 933A F32D 3ABD 5CAF"; } ];
+  };
   jab = {
     name = "Joshua Bronson";
     email = "jabronson@gmail.com";
diff --git a/pkgs/by-name/ch/chuffed/package.nix b/pkgs/by-name/ch/chuffed/package.nix
new file mode 100644
index 000000000000..bfa411a1e8fd
--- /dev/null
+++ b/pkgs/by-name/ch/chuffed/package.nix
@@ -0,0 +1,28 @@
+{
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  lib,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "chuffed";
+  version = "0.13.2";
+
+  src = fetchFromGitHub {
+    owner = "chuffed";
+    repo = "chuffed";
+    tag = finalAttrs.version;
+    hash = "sha256-D4HEcCDcJi05AL9suc7Twtf/wjpwBkLEeumGY3nNi5g=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    homepage = "https://github.com/chuffed/chuffed";
+    description = "The Chuffed CP solver";
+    longDescription = "Chuffed is a state of the art lazy clause solver designed from the ground up with lazy clause generation in mind.";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jaanonim ];
+    platforms = lib.platforms.all;
+  };
+})