diff --git a/src/output/output_httpts.cpp b/src/output/output_httpts.cpp
index 1e5e051a..5848247a 100644
--- a/src/output/output_httpts.cpp
+++ b/src/output/output_httpts.cpp
@@ -1,22 +1,33 @@
 #include "output_httpts.h"
+#include "lib/defines.h"
 #include <mist/defines.h>
 #include <mist/http_parser.h>
 #include <mist/procs.h>
 #include <mist/stream.h>
+#include <mist/ts_packet.h>
+#include <mist/ts_stream.h>
 #include <mist/url.h>
+#include <dirent.h>
 #include <unistd.h>
 
 namespace Mist{
   OutHTTPTS::OutHTTPTS(Socket::Connection &conn) : TSOutput(conn){
     sendRepeatingHeaders = 500; // PAT/PMT every 500ms (DVB spec)
+    removeOldPlaylistFiles = true;
+
+    if (targetParams["overwrite"].size()){
+      std::string paramValue = targetParams["overwrite"];
+      if (paramValue == "0" || paramValue == "false"){
+        removeOldPlaylistFiles = false;
+      }
+    }
 
     if (config->getString("target").substr(0, 6) == "srt://"){
       std::string tgt = config->getString("target");
       HTTP::URL srtUrl(tgt);
       config->getOption("target", true).append("ts-exec:srt-live-transmit file://con " + srtUrl.getUrl());
       INFO_MSG("Rewriting SRT target '%s' to '%s'", tgt.c_str(), config->getString("target").c_str());
-    }
-    if (config->getString("target").substr(0, 8) == "ts-exec:"){
+    } else if (config->getString("target").substr(0, 8) == "ts-exec:"){
       std::string input = config->getString("target").substr(8);
       char *args[128];
       uint8_t argCnt = 0;
@@ -44,6 +55,59 @@ namespace Mist{
 
       wantRequest = false;
       parseData = true;
+    } else if (config->getString("target").size()){
+      HTTP::URL target(config->getString("target"));
+      // If writing to a playlist file, set target strings and remember playlist location
+      if(target.getExt() == "m3u" || target.getExt() == "m3u8"){
+        // Location to .m3u(8) file we will keep updated
+        playlistLocation = target.getFilePath();
+        // Subfolder name which gets prepended to each entry in the playlist file
+        prepend = "./segments_" + target.path.substr(target.path.rfind("/") + 1, target.path.size() - target.getExt().size() - target.path.rfind("/") - 2) + "/";
+        HTTP::URL tsFolderPath(target.link(prepend).getFilePath());
+        tsFilePath = tsFolderPath.getFilePath() + "$datetime.ts";
+        INFO_MSG("Playlist location will be '%s'. TS filename will be in the form of '%s'", playlistLocation.c_str(), tsFilePath.c_str());
+        // Remember target name including the $datetime variable
+        setenv("MST_ORIG_TARGET", tsFilePath.c_str(), 1);
+        // If the playlist exists, first remove existing TS files
+        if (removeOldPlaylistFiles){
+          DIR *dir = opendir(tsFolderPath.getFilePath().c_str());
+          if (dir){
+            INFO_MSG("Removing TS files in %s", tsFolderPath.getFilePath().c_str());
+            struct dirent *dp;
+            do{
+              errno = 0;
+              if ((dp = readdir(dir))){
+                HTTP::URL filePath = tsFolderPath.link(dp->d_name);
+                if (filePath.getExt() == "ts"){
+                  MEDIUM_MSG("Removing TS file '%s'", filePath.getFilePath().c_str());
+                  remove(filePath.getFilePath().c_str());
+                }
+              }
+            }while (dp != NULL);
+            closedir(dir);
+          }
+          // Also remove the playlist file itself. SendHeader handles (re)creation of the playlist file
+          if (!remove(playlistLocation.c_str())){
+            HIGH_MSG("Removed existing playlist file '%s'", playlistLocation.c_str());
+          }
+        }else{
+          // Else we want to add the #EXT-X-DISCONTINUITY tag
+          std::ofstream outPlsFile;
+          outPlsFile.open(playlistLocation.c_str(), std::ofstream::app);
+          outPlsFile << "#EXT-X-DISCONTINUITY" << "\n";
+          outPlsFile.close();
+        }
+        // Set first target filename
+        Util::streamVariables(tsFilePath, streamName);
+        if (tsFilePath.rfind('?') != std::string::npos){
+          tsFilePath.erase(tsFilePath.rfind('?'));
+        }
+        config->getOption("target", true).append(tsFilePath);
+        // Finally set split time in seconds
+        std::stringstream ss;
+        ss << config->getInteger("targetSegmentLength");
+        targetParams["split"] = ss.str();
+      }
     }
   }
 
@@ -76,6 +140,8 @@ namespace Mist{
     capa["methods"][0u]["priority"] = 1;
     capa["push_urls"].append("/*.ts");
     capa["push_urls"].append("ts-exec:*");
+    capa["push_urls"].append("/*.m3u");
+    capa["push_urls"].append("/*.m3u8");
 
 #ifndef WITH_SRT
     {
@@ -98,8 +164,21 @@ namespace Mist{
     opt["arg"] = "string";
     opt["default"] = "";
     opt["arg_num"] = 1;
-    opt["help"] = "Target filename to store TS file as, or - for stdout.";
+    opt["help"] = "Target filename to store TS file as, '*.m3u8' or '*.m3u' for writing to a playlist, or - for stdout.";
     cfg->addOption("target", opt);
+
+    opt.null();
+    opt["arg"] = "integer";
+    opt["long"] = "targetSegmentLength";
+    opt["short"] = "l";
+    opt["help"] = "Target time duration in seconds for TS files, when outputting to disk.";
+    opt["value"].append(5);
+    config->addOption("targetSegmentLength", opt);
+    capa["optional"]["targetSegmentLength"]["name"] = "Length of TS files (ms)";
+    capa["optional"]["targetSegmentLength"]["help"] = "Target time duration in milliseconds for TS files, when outputting to disk.";
+    capa["optional"]["targetSegmentLength"]["option"] = "--targetLength";
+    capa["optional"]["targetSegmentLength"]["type"] = "uint";
+    capa["optional"]["targetSegmentLength"]["default"] = 5;
   }
 
   bool OutHTTPTS::isRecording(){return config->getString("target").size();}
@@ -126,6 +205,89 @@ namespace Mist{
     wantRequest = false;
   }
 
+  /// \brief Goes through all of the packets in a TS file in order to calculate the total duration
+  /// \param firstTime: is set to the firstTime of the TS file
+  float OutHTTPTS::calculateSegmentDuration(std::string filepath, uint64_t & firstTime){
+    firstTime = -1;
+    uint64_t lastTime = 0;
+    FILE *inFile;
+    TS::Packet packet;
+    DTSC::Packet headerPack;
+    TS::Stream tsStream;
+
+    inFile = fopen(filepath.c_str(), "r");
+    while (!feof(inFile)){
+      if (!packet.FromFile(inFile)){
+        break;
+      }
+      tsStream.parse(packet, 0);
+      while (tsStream.hasPacketOnEachTrack()){
+        tsStream.getEarliestPacket(headerPack);
+        lastTime = headerPack.getTime();
+        if (firstTime > lastTime){
+          firstTime = headerPack.getTime();
+        }
+        DONTEVEN_MSG("Found DTSC packet with timestamp '%zu'", lastTime);
+      }
+    }
+    fclose(inFile);
+    HIGH_MSG("Duration of TS file at location '%s' is %zu ms (%zu - %zu)", filepath.c_str(), (lastTime - firstTime), lastTime, firstTime);
+    return (lastTime - firstTime);
+  }
+
+  void OutHTTPTS::sendHeader(){
+    bool writeTimestamp = true;
+    if (previousFile != ""){
+      std::ofstream outPlsFile;
+      // Calculate segment duration and round up to the nearest integer
+      uint64_t firstTime = 0;
+      float segmentDuration = (calculateSegmentDuration(previousFile, firstTime) / 1000);
+      if (segmentDuration > config->getInteger("targetSegmentLength")){
+        WARN_MSG("Segment duration exceeds target segment duration. This may cause playback stalls or other errors");
+      }
+      // If the playlist does not exist, init it
+      FILE *fileHandle = fopen(playlistLocation.c_str(), "r");
+      if (!fileHandle || removeOldPlaylistFiles){
+        INFO_MSG("Creating new playlist at '%s'", playlistLocation.c_str());
+        removeOldPlaylistFiles = false;
+        outPlsFile.open(playlistLocation.c_str(), std::ofstream::trunc);
+        outPlsFile << "#EXTM3U\n" << "#EXT-X-VERSION:3\n" << "#EXT-X-PLAYLIST-TYPE:EVENT\n"
+          << "#EXT-X-TARGETDURATION:" << config->getInteger("targetSegmentLength") << "\n#EXT-X-MEDIA-SEQUENCE:0\n";
+        // Add current livestream timestamp
+        if (M.getLive()){
+          uint64_t unixMs = M.getBootMsOffset() + (Util::unixMS() - Util::bootMS()) + firstTime;
+          time_t uSecs = unixMs/1000;
+          struct tm *tVal = gmtime(&uSecs);
+          char UTCTime[25];
+          snprintf(UTCTime, 25, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d.%3zuZ", tVal->tm_year + 1900, tVal->tm_mon + 1, tVal->tm_mday, tVal->tm_hour, tVal->tm_min, tVal->tm_sec, unixMs%1000);
+          
+          outPlsFile << "#EXT-X-PROGRAM-DATE-TIME:" << UTCTime << std::endl;
+          writeTimestamp = false;
+        }
+      // Otherwise open it in append mode
+      } else {
+        fclose(fileHandle);
+        outPlsFile.open(playlistLocation.c_str(), std::ofstream::app);
+      }
+      // Add current timestamp
+      if (M.getLive() && writeTimestamp){
+        uint64_t unixMs = M.getBootMsOffset() + (Util::unixMS() - Util::bootMS()) + firstTime;
+        time_t uSecs = unixMs/1000;
+        struct tm *tVal = gmtime(&uSecs);
+        char UTCTime[25];
+        snprintf(UTCTime, 25, "%.4d-%.2d-%.2dT%.2d:%.2d:%.2d.%3zuZ", tVal->tm_year + 1900, tVal->tm_mon + 1, tVal->tm_mday, tVal->tm_hour, tVal->tm_min, tVal->tm_sec, unixMs%1000);
+        
+        outPlsFile << "#EXT-X-PROGRAM-DATE-TIME:" << UTCTime << std::endl;
+      }
+      INFO_MSG("Adding new segment of %.2f seconds to playlist '%s'", segmentDuration, playlistLocation.c_str());
+      // Append duration & TS filename to playlist file
+      outPlsFile << "#EXTINF:" << segmentDuration << ",\n" << prepend << previousFile.substr(previousFile.rfind("/") + 1) << "\n";
+      outPlsFile.close();
+    }
+
+    TSOutput::sendHeader();
+  }
+
   void OutHTTPTS::sendTS(const char *tsData, size_t len){
     if (isRecording()){
       myConn.SendNow(tsData, len);
diff --git a/src/output/output_httpts.h b/src/output/output_httpts.h
index cd78b6a6..0594a2d3 100644
--- a/src/output/output_httpts.h
+++ b/src/output/output_httpts.h
@@ -14,8 +14,22 @@ namespace Mist{
   private:
     bool isRecording();
     bool isFileTarget(){
-      return isRecording() && config->getString("target").substr(0, 8) != "ts-exec:";
+      HTTP::URL target(config->getString("target"));
+      if (isRecording() && (target.getExt() == "ts" || config->getString("target").substr(0, 8) == "ts-exec:")){return true;}
+      return false;
     }
+    virtual bool inlineRestartCapable() const{return true;}
+    void sendHeader();
+    float calculateSegmentDuration(std::string filepath, uint64_t & firstTime);
+    // Location of playlist file which we need to keep updated
+    std::string playlistLocation;
+    std::string tsFilePath;
+    // Subfolder name (based on playlist name) which gets prepended to each entry in the playlist file
+    std::string prepend;
+    // Defaults to True. When exporting to .m3u8 & TS, it will overwrite the existing playlist file and remove existing .TS files
+    bool removeOldPlaylistFiles;
+    // Amount of segments written to the playlist since the last 'EXT-X-PROGRAM-DATE-TIME' tag
+    uint32_t previousTimestamp;
   };
 }// namespace Mist