diff --git a/org.gnome.Hammond.json b/org.gnome.Hammond.json
index 459b13c..09b1936 100644
--- a/org.gnome.Hammond.json
+++ b/org.gnome.Hammond.json
@@ -14,23 +14,23 @@
         "--talk-name=org.freedesktop.Notifications"
     ],
     "build-options": {
+        "append-path": "/usr/lib/sdk/rust-stable/bin",
+        "build-args": [
+            "--share=network"
+        ],
         "env": {
             "CARGO_HOME": "/run/build/Hammond/cargo"
-        },
-        "build-args": [ "--share=network" ]
+        }
     },
     "modules": [
         {
             "name": "Hammond",
-            "buildsystem": "simple",
-            "build-commands": [
-                "source /usr/lib/sdk/rust-stable/enable.sh && ./configure --prefix=/app && make && make install"
-            ],
+            "buildsystem": "meson",
             "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/alatiera/Hammond.git",
-                    "branch": "master"
+                    "branch": "client-rework"
                 }
             ]
         }