diff --git a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
index 94a6408c6..becd1e1cf 100755
--- a/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
+++ b/public/scala/src/org/broadinstitute/sting/queue/QCommandLine.scala
@@ -115,6 +115,7 @@ class QCommandLine extends CommandLineProgram with Logging {
     // walk over each script, calling onExecutionDone
     for (script <- allQScripts) {
       script.onExecutionDone(qGraph.getFunctionsAndStatus(script.functions), qGraph.success)
+      JobLogging.printLogs(qGraph.getFunctionsAndStatus(script.functions))
     }
 
     if (!qGraph.success) {
diff --git a/public/scala/src/org/broadinstitute/sting/queue/util/JobLogging.scala b/public/scala/src/org/broadinstitute/sting/queue/util/JobLogging.scala
new file mode 100644
index 000000000..d24ebe92b
--- /dev/null
+++ b/public/scala/src/org/broadinstitute/sting/queue/util/JobLogging.scala
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2011, The Broad Institute
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.broadinstitute.sting.queue.util
+import org.broadinstitute.sting.queue.function.QFunction
+import org.broadinstitute.sting.gatk.report.{GATKReportTable, GATKReport}
+import org.broadinstitute.sting.utils.exceptions.UserException
+import org.broadinstitute.sting.queue.engine.JobRunInfo
+
+/**
+ * A mixin to add Job info to the class
+ */
+trait JobLogging extends QFunction {
+  private var group: String = _
+  private var features: Map[String, String] = null
+
+  def getGroup = group
+  def isEnabled = group != null
+  def getFeatureNames: List[String] = features.keys.toList
+  def getFeatures = features
+  def get(key: String): String = {
+    features.get(key) match {
+      case Some(x) => x
+      case None => throw new RuntimeException("Get called with key %s but no value was found".format(key))
+    }
+  }
+  def getName: String = features.get("jobName").get
+
+  private def addRunInfo(info: JobRunInfo) {
+    features = features ++ Map(
+      "analysisName" -> this.analysisName,
+      "jobName" -> this.jobName,
+      "intermediate" -> this.isIntermediate,
+      "startTime" -> info.getStartTime,
+      "doneTime" -> info.getDoneTime,
+      "memUsedInGb" -> info.getMemoryUsedInGb,
+      "runtime" -> info.getRuntimeInMs,
+      "hostName" -> info.getHostname).mapValues(_.toString)
+  }
+
+  def setJobLogging(group: String) {
+    this.group = group
+  }
+
+  def setJobLogging(group: String, features: Map[String, Any]) {
+    this.group = group
+    this.features = features.mapValues(_.toString)
+  }
+}
+
+object JobLogging {
+  def printLogs(jobs: Map[QFunction, JobRunInfo]) {
+    val jobLogs: List[JobLogging] = jobLoggingSublist(jobs.keys.toList)
+    jobLogs.foreach((job: JobLogging) => job.addRunInfo(jobs.get(job).get))
+    printJobLogging(jobLogs)
+  }
+
+  private def jobLoggingSublist(l: List[QFunction]): List[JobLogging] = {
+    def asJogLogging(qf: QFunction): JobLogging = qf match {
+      case x: JobLogging => x
+      case _ => null
+    }
+
+    l.map(asJogLogging).filter(_ != null)
+  }
+
+  /**
+   * Prints the JobLogging logs to a GATKReport.  First splits up the
+   * logs by group, and for each group generates a GATKReportTable
+   */
+  private def printJobLogging(logs: List[JobLogging]) {
+    // create the report
+    val report: GATKReport = new GATKReport
+
+    // create a table for each group of logs
+    for ( (group, groupLogs) <- groupLogs(logs) ) {
+      report.addTable(group, "Job logs for " + group)
+      val table: GATKReportTable = report.getTable(group)
+      table.addPrimaryKey("jobName", false)
+      val keys = logKeys(groupLogs)
+
+      // add the columns
+      keys.foreach(table.addColumn(_, 0))
+      for (log <- groupLogs) {
+        for ( key <- keys )
+          table.set(log.getName, key, log.get(key))
+      }
+    }
+
+    report.print(System.out)
+  }
+
+  private def groupLogs(logs: List[JobLogging]): Map[String, List[JobLogging]] = {
+    logs.groupBy(_.getGroup)
+  }
+
+  private def logKeys(logs: List[JobLogging]): Set[String] = {
+    // the keys should be the same for each log, but we will check that
+    val keys = Set[String](logs(0).getFeatureNames : _*)
+
+    for ( log <- logs )
+      if ( keys.sameElements(Set(log.getFeatureNames)) )
+        throw new UserException(("All JobLogging jobs in the same group must have the same set of features.  " +
+          "We found one with %s and another with %s").format(keys, log.getFeatureNames))
+
+    keys
+  }
+}