diff --git a/NEWS b/NEWS
index dc84c5ee5ef144e7ba1457abc8630e6ca8c8d7fa..7f8c2398768ad64ab8d8f9bf447ca7bc871d48c7 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ documents those changes that are of interest to users and admins.
  -- Add support for NodeHostname in node configuration
  -- Make "scontrol show daemons" function properly on front-end system 
     (e.g. Blue Gene)
+ -- Fix srun bug when --input, --output and --error are all "none"
 
 * Changes in SLURM 0.4.0-pre3
 =============================
diff --git a/src/srun/fname.c b/src/srun/fname.c
index c047d79c83294a3dc70767345b34abb5f107f884..e0a967f8d023eb2cbc40107dcf4edcf80589ca20 100644
--- a/src/srun/fname.c
+++ b/src/srun/fname.c
@@ -41,13 +41,13 @@ fname_create(job_t *job, char *format)
 	if ((format == NULL)
 	    || (strncasecmp(format, "all", (size_t) 3) == 0)
 	    || (strncmp(format, "-", (size_t) 1) == 0)       ) {
-		fname->type = IO_ALL;
-		fname->name = NULL;
+		/* fname->type = IO_ALL; */
+		/* fname->name = NULL; */
 		return fname;
 	}
 
 	if (strncasecmp(format, "none", (size_t) 4) == 0) {
-		fname->type = IO_NONE;
+		/* fname->type = IO_ALL; */
 		fname->name = "/dev/null";
 		return fname;
 	}