diff --git a/jujutsu/.config/jj/conf.d/waarp.toml b/jujutsu/.config/jj/conf.d/waarp.toml
new file mode 100644
index 0000000..151d362
--- /dev/null
+++ b/jujutsu/.config/jj/conf.d/waarp.toml
@@ -0,0 +1,4 @@
+--when.repositories = ["~/Progs/waarp"]
+
+[user]
+email = "bruno.carlin@waarp.org"
diff --git a/jujutsu/.config/jj/config.toml b/jujutsu/.config/jj/config.toml
index 30d58ff..719134e 100644
--- a/jujutsu/.config/jj/config.toml
+++ b/jujutsu/.config/jj/config.toml
@@ -10,12 +10,17 @@ editor = "nvim"
 diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
 merge-editor = "nvim"
 diff.tool = ["delta", "--syntax-theme", "Solarized (dark)", "$left", "$right"]
+show-cryptographic-signatures = true
 
 [merge-tools.nvim]
 diff-args = ["-d", "$left", "$right"]
-merge-args = ["-d", "$left", "$base", "$right", "-c", "wincmd l"]
+merge-args = ["-d", "$left", "$output", "$right", "-c", "wincmd l"]
 merge-tool-edits-conflict-markers = true
 
+[signing]
+behavior = "own"
+backend = "gpg"
+
 [colors]
 "rest" = "bright green"
 "working_copy empty" = "green"
@@ -24,5 +29,13 @@ merge-tool-edits-conflict-markers = true
 "working_copy change_id" = "magenta"
 "working_copy timestamp" = "cyan"
 
-[git]
-subprocess = true
+[templates]
+draft_commit_description = '''
+concat(
+  coalesce(description, "\n"),
+  surround(
+    "\nJJ: This commit contains the following changes:\n", "",
+    indent("JJ:     ", diff.summary() ++ "\n\n" ++ diff.git()),
+  ),
+)
+'''