diff --git a/sys/share/pcmain.c b/sys/share/pcmain.c
index 12804c45d..c5715f1c3 100644
--- a/sys/share/pcmain.c
+++ b/sys/share/pcmain.c
@@ -167,7 +167,7 @@ char *argv[];
 			fqn_prefix[prefcnt] = fqn_prefix[0];
 		}
 #endif
-#ifdef CHDIR
+#if defined(CHDIR) && !defined(NOCWD_ASSUMPTIONS)
 		chdirx (dir, 1);
 #endif
 	}