diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0390d67afa8f..184c7b2e81c9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7919,6 +7919,12 @@
     name = "Elis Hirwing";
     keys = [ { fingerprint = "67FE 98F2 8C44 CF22 1828  E12F D57E FA62 5C9A 925F"; } ];
   };
+  etwas = {
+    email = "ein@etwas.me";
+    github = "eetwas";
+    githubId = 74488187;
+    name = "etwas";
+  };
   eu90h = {
     email = "stefan@eu90h.com";
     github = "eu90h";
diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix
index 94f56bd914f4..5faa617b441d 100644
--- a/pkgs/development/libraries/sdbus-cpp/default.nix
+++ b/pkgs/development/libraries/sdbus-cpp/default.nix
@@ -35,7 +35,9 @@ let
       ];
 
       cmakeFlags = [
-        (lib.cmakeBool "BUILD_CODE_GEN" true)
+        (lib.cmakeBool (
+          if lib.versionOlder finalAttrs.version "2.0.0" then "BUILD_CODE_GEN" else "SDBUSCPP_BUILD_CODEGEN"
+        ) true)
       ];
 
       meta = {
@@ -52,7 +54,7 @@ let
           inherent design complexities and limitations.
         '';
         license = lib.licenses.lgpl2Only;
-        maintainers = [ ];
+        maintainers = with lib.maintainers; [ etwas ];
         platforms = lib.platforms.linux;
         mainProgram = "sdbus-c++-xml2cpp";
       };
@@ -65,7 +67,7 @@ in
   };
 
   sdbus-cpp_2 = generic {
-    version = "2.0.0";
-    hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=";
+    version = "2.1.0";
+    hash = "sha256-JnjabBr7oELLsUV9a+dAAaRyUzaMIriu90vkaVJg2eY=";
   };
 }