diff --git a/ch.psi.fdaq/Readme.md b/ch.psi.fdaq/Readme.md
index 260e032..78c9c65 100644
--- a/ch.psi.fdaq/Readme.md
+++ b/ch.psi.fdaq/Readme.md
@@ -5,3 +5,15 @@ server for data retrieval.
 
 The fdaq code provides exactly 2 to functionalities, it can query on the data socket for data (specifying how many data point)
 and can send a reset request on the reset channel.
+
+# Configuration
+The software is configured by a properties file that is specified via `-Dch.psi.fdaq.home=fdaq.properties` .
+
+Following properties can be specified:
+|Property | Default|
+|--|--|
+|ch.psi.fdaq.hostname | mchip015.psi.ch|
+|port | 2233|
+|killPort | 2234|
+|filePrefix | ${yyyy_MM}/${yyyyMMdd}/${yyyyMMddHHmmss}_${name}/${yyyyMMddHHmm}_|
+
diff --git a/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqConfiguration.java b/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqConfiguration.java
index 8748ad9..0da28a2 100644
--- a/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqConfiguration.java
+++ b/ch.psi.fdaq/src/main/java/ch/psi/fdaq/FdaqConfiguration.java
@@ -73,6 +73,7 @@ public class FdaqConfiguration {
 			hostname = properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".hostname", "mchip015.psi.ch");
 			port = Integer.parseInt(properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".port", "2233"));
 			killPort = Integer.parseInt(properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".killPort", "2234"));
+			filePrefix = properties.getProperty(FdaqConfiguration.class.getPackage().getName()+".filePrefix","${yyyy_MM}/${yyyyMMdd}/${yyyyMMddHHmmss}_${name}/${yyyyMMddHHmm}_");
 		}
 		dataDirectory = config+"/data";
 	}