diff --git a/src/sacct/sacct_stat.c b/src/sacct/sacct_stat.c
index 824448a5441d892059003d131a73c0b339dc534e..59642ad64268b291a2d1dade65ea2a4c7a92ac38 100644
--- a/src/sacct/sacct_stat.c
+++ b/src/sacct/sacct_stat.c
@@ -238,6 +238,10 @@ int _sacct_query(resource_allocation_response_msg_t *job, uint32_t step_id)
 	pthread_cond_destroy(&stat_cond);
 	slurm_mutex_destroy(&stat_mutex);
 	if(step.ntasks) {
+		step.sacct.ave_rss *= 1024;
+		step.sacct.max_rss *= 1024;
+		step.sacct.ave_vsize *= 1024;
+		step.sacct.max_vsize *= 1024;
 		tempf = step.sacct.ave_cpu/step.ntasks;
 		tempf /= 100;
 		step.sacct.ave_cpu = (uint32_t)tempf;
diff --git a/src/slurmd/slurmstepd/slurmstepd.c b/src/slurmd/slurmstepd/slurmstepd.c
index e7b57c490b1cd5c20c9f0a4ca3d933b6587555c9..57ae7b3a1f92fe8f1336269df7843f4d8473ade0 100644
--- a/src/slurmd/slurmstepd/slurmstepd.c
+++ b/src/slurmd/slurmstepd/slurmstepd.c
@@ -4,7 +4,8 @@
  *****************************************************************************
  *  Copyright (C) 2002 The Regents of the University of California.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
- *  Written by Mark Grondona <da@llnl.gov>.
+ *  Written by Danny Auble <da@llnl.gov> 
+ *  and Christopher Morrone <morrone2@llnl.gov>.
  *  UCRL-CODE-217948.
  *  
  *  This file is part of SLURM, a resource management program.