diff --git a/contrib/chg/chg.c b/contrib/chg/chg.c
--- a/contrib/chg/chg.c
+++ b/contrib/chg/chg.c
@@ -211,10 +211,9 @@ static void execcmdserver(const struct c
 	const char *baseargv[] = {
 		hgcmd,
 		"serve",
-		"--cwd", "/",
 		"--cmdserver", "chgunix",
 		"--address", opts->sockname,
-		"--daemon-postexec", "none",
+		"--daemon-postexec", "chdir:/",
 		"--pid-file", opts->pidfile,
 		"--config", "extensions.chgserver=",
 	};