diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index dfe60c1bb596b57ace8f2fa77653db833104a3fb..3ac2dba869042b8de9b5e89f5596de9a8479fe1c 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -73,7 +73,7 @@ time limit. When the time limit is reached, the job's processes are sent
 SIGTERM followed by SIGKILL. The interval between signals is specified by 
 the SLURM configuration parameter \fBKillWait\fR.
 .TP
-\fB\-\-cddir\fR=\fIpath\fR
+\fB\-\-chdir\fR=\fIpath\fR
 have the remote processes do a chdir to \fIpath\fR before beginning
 execution. The default is to chdir to the current working directory
 of the \fBsrun\fR process.
@@ -300,7 +300,7 @@ will terminate if resources are not immediately available.
 When initiating remote processes
 .B srun
 will propagate the current working directory, unless
-\fB\-\-cddir\fR=\fIpath\fR is specified, in which case \fIpath\fR will
+\fB\-\-chdir\fR=\fIpath\fR is specified, in which case \fIpath\fR will
 become the working directory for the remote processes.
 .PP
 The \fB-n\fB, \fB-c\fR, and \fB-N\fR options control how CPUs  and
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 0e4d8ed3d77e9ba8b9352bdeb5066303446cadc9..2ab38ac2a398032d36e7733c19a377a29e227a63 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -98,7 +98,7 @@
 #define OPT_VERSION     0x12
 #define OPT_JOIN        0x13
 #define OPT_STEAL       0x14
-#define OPT_CDDIR       0x15
+#define OPT_CHDIR       0x15
 #define OPT_BATCH       0x16
 #define OPT_TIME        0x17
 #define OPT_THREADS     0x18
@@ -196,7 +196,7 @@ struct poptOption runTable[] = {
 	{"time", 't', POPT_ARG_INT, &opt.time_limit, OPT_TIME,
 	 "time limit",
 	 "minutes"},
-	{"chdir", 'D', POPT_ARG_STRING, NULL, OPT_CDDIR,
+	{"chdir", 'D', POPT_ARG_STRING, NULL, OPT_CHDIR,
 	 "change current working directory of remote procs",
 	 "path"},
 	{"immediate", 'I', POPT_ARG_NONE, &opt.immediate, 0,
@@ -882,7 +882,7 @@ static void _opt_args(int ac, char **av)
 			}
 			break;
 
-		case OPT_CDDIR:
+		case OPT_CHDIR:
 			xfree(opt.cwd);
 			opt.cwd = xstrdup(arg);
 			break;