diff --git a/src/output/output.cpp b/src/output/output.cpp
index 9a7bf131..ea12e987 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -61,6 +61,7 @@ namespace Mist{
       DEBUG_MSG(DLVL_WARN, "Warning: MistOut created with closed socket!");
     }
     sentHeader = false;
+    isRecordingToFile = false;
   }
 
   void Output::listener(Util::Config & conf, int (*callback)(Socket::Connection & S)){
@@ -912,8 +913,17 @@ namespace Mist{
     
     /*LTS-START*/
     if(Triggers::shouldTrigger("CONN_CLOSE", streamName)){
-      std::string payload = streamName+"\n"+getConnectedHost()+"\n"+capa["name"].asStringRef()+"\n"+reqUrl; ///\todo generate payload
-      Triggers::doTrigger("CONN_CLOSE", payload, streamName); //no stream specified    
+      std::string payload = streamName+"\n"+getConnectedHost()+"\n"+capa["name"].asStringRef()+"\n"+reqUrl;
+      Triggers::doTrigger("CONN_CLOSE", payload, streamName);
+    }
+    if (isRecordingToFile && config->hasOption("target") && Triggers::shouldTrigger("RECORDING_END", streamName)){
+      std::stringstream payl;
+      payl << streamName << '\n';
+      payl << config->getString("target") << '\n';
+      payl << capa["name"].asStringRef() << '\n';
+      payl << myConn.dataUp() << '\n';
+      payl << (Util::epoch() - myConn.connTime()) << '\n';
+      Triggers::doTrigger("RECORDING_END", payl.str(), streamName);
     }
     /*LTS-END*/
   
@@ -1276,6 +1286,7 @@ namespace Mist{
       return false;
     }
     close(outFile);
+    isRecordingToFile = true;
     return true;
   }
 
diff --git a/src/output/output.h b/src/output/output.h
index 405b248f..53d406fd 100644
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -93,6 +93,7 @@ namespace Mist {
       void loadPageForKey(long unsigned int trackId, long long int keyNum);
       int pageNumForKey(long unsigned int trackId, long long int keyNum);
       int pageNumMax(long unsigned int trackId);
+      bool isRecordingToFile;
       unsigned int lastStats;///<Time of last sending of stats.
       long long unsigned int firstTime;///< Time of first packet after last seek. Used for real-time sending.
       std::map<unsigned long, unsigned long> nxtKeyNum;///< Contains the number of the next key, for page seeking purposes.