diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Flash.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Flash.scala
index 7276f951df068b5eadfc2cd6a45e2c336dfbb8b8..730d28177b51a8376b9819c6cbf83eaee8469232 100644
--- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Flash.scala
+++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Flash.scala
@@ -47,9 +47,18 @@ class Flash(val root: Configurable) extends BiopetCommandLineFunction with Versi
   var compressProgArgs: Option[String] = config("compress_prog_args")
   var outputSuffix: Option[String] = config("output_suffix")
 
+  private def suffix = outputSuffix.getOrElse("fastq") + (if(compress) ".gz" else "")
+
+  def combinedFastq = new File(outputDirectory, s"$outputPrefix.extendedFrags.$suffix")
+  def notCombinedR1 = new File(outputDirectory, s"$outputPrefix.notCombined_1.$suffix")
+  def notCombinedR2 = new File(outputDirectory, s"$outputPrefix.notCombined_2.$suffix")
+  def outputHistogramTable = new File(outputDirectory, s"$outputPrefix.hist")
+  def outputHistogram = new File(outputDirectory, s"$outputPrefix.histogram")
+
   override def beforeGraph(): Unit = {
     super.beforeGraph()
-    //FIXME: output files
+    outputFiles :::= combinedFastq :: notCombinedR1 ::
+      notCombinedR2 :: outputHistogramTable :: outputHistogram :: Nil
   }
 
   def cmdLine = executable +