diff --git a/src/dvr/dvr.h b/src/dvr/dvr.h
index 59d285cc..3f946d63 100644
--- a/src/dvr/dvr.h
+++ b/src/dvr/dvr.h
@@ -66,6 +66,8 @@ extern struct dvr_entry_list dvrentries;
 #define DVR_CLEAN_TITLE	        0x100
 #define DVR_TAG_FILES           0x200
 #define DVR_SKIP_COMMERCIALS    0x400
+#define DVR_SUBTITLE_IN_TITLE	0x800
+#define DVR_EPISODE_BEFORE_DATE	0x1000
 
 typedef enum {
   DVR_PRIO_IMPORTANT,
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index fd54d3a0..09eccfff 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -181,6 +181,22 @@ dvr_make_title(char *output, size_t outlen, dvr_entry_t *de)
   snprintf(output + strlen(output), outlen - strlen(output),
 	   "%s", lang_str_get(de->de_title, NULL));
 
+  if(cfg->dvr_flags & DVR_EPISODE_BEFORE_DATE) {
+    if(cfg->dvr_flags & DVR_EPISODE_IN_TITLE) {
+      if(de->de_bcast && de->de_bcast->episode)
+        epg_episode_number_format(de->de_bcast->episode,
+                                  output + strlen(output),
+                                  outlen - strlen(output),
+                                  ".", "S%02d", NULL, "E%02d", NULL);
+    }
+  }
+
+  if(cfg->dvr_flags & DVR_SUBTITLE_IN_TITLE) {
+    if(de->de_bcast && de->de_bcast->episode && de->de_bcast->episode->subtitle)
+      snprintf(output + strlen(output), outlen - strlen(output),
+           ".%s", lang_str_get(de->de_bcast->episode->subtitle, NULL));
+  }
+
   localtime_r(&de->de_start, &tm);
   
   if(cfg->dvr_flags & DVR_DATE_IN_TITLE) {
@@ -193,12 +209,14 @@ dvr_make_title(char *output, size_t outlen, dvr_entry_t *de)
     snprintf(output + strlen(output), outlen - strlen(output), ".%s", buf);
   }
 
-  if(cfg->dvr_flags & DVR_EPISODE_IN_TITLE) {
-    if(de->de_bcast && de->de_bcast->episode)  
-      epg_episode_number_format(de->de_bcast->episode,
-                                output + strlen(output),
-                                outlen - strlen(output),
-                                ".", "S%02d", NULL, "E%02d", NULL);
+  if(!(cfg->dvr_flags & DVR_EPISODE_BEFORE_DATE)) {
+    if(cfg->dvr_flags & DVR_EPISODE_IN_TITLE) {
+      if(de->de_bcast && de->de_bcast->episode)
+        epg_episode_number_format(de->de_bcast->episode,
+                                  output + strlen(output),
+                                  outlen - strlen(output),
+                                  ".", "S%02d", NULL, "E%02d", NULL);
+    }
   }
 
   if(cfg->dvr_flags & DVR_CLEAN_TITLE) {
@@ -1121,7 +1139,13 @@ dvr_init(void)
       if(!htsmsg_get_u32(m, "skip-commercials", &u32) && !u32)
         cfg->dvr_flags &= ~DVR_SKIP_COMMERCIALS;
 
-      tvh_str_set(&cfg->dvr_postproc, htsmsg_get_str(m, "postproc"));
+      if(!htsmsg_get_u32(m, "subtitle-in-title", &u32) && u32)
+        cfg->dvr_flags |= DVR_SUBTITLE_IN_TITLE;
+
+      if(!htsmsg_get_u32(m, "episode-before-date", &u32) && u32)
+        cfg->dvr_flags |= DVR_EPISODE_BEFORE_DATE;
+
+		tvh_str_set(&cfg->dvr_postproc, htsmsg_get_str(m, "postproc"));
     }
 
     htsmsg_destroy(l);
@@ -1287,6 +1311,8 @@ dvr_save(dvr_config_t *cfg)
   htsmsg_add_u32(m, "clean-title", !!(cfg->dvr_flags & DVR_CLEAN_TITLE));
   htsmsg_add_u32(m, "tag-files", !!(cfg->dvr_flags & DVR_TAG_FILES));
   htsmsg_add_u32(m, "skip-commercials", !!(cfg->dvr_flags & DVR_SKIP_COMMERCIALS));
+  htsmsg_add_u32(m, "subtitle-in-title", !!(cfg->dvr_flags & DVR_SUBTITLE_IN_TITLE));
+  htsmsg_add_u32(m, "episode-before-date", !!(cfg->dvr_flags & DVR_EPISODE_BEFORE_DATE));
   if(cfg->dvr_postproc != NULL)
     htsmsg_add_str(m, "postproc", cfg->dvr_postproc);
 
diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 6ff9fbb8..7a359dcb 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -1306,6 +1306,8 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
     htsmsg_add_u32(r, "cleanTitle", !!(cfg->dvr_flags & DVR_CLEAN_TITLE));
     htsmsg_add_u32(r, "tagFiles", !!(cfg->dvr_flags & DVR_TAG_FILES));
     htsmsg_add_u32(r, "commSkip", !!(cfg->dvr_flags & DVR_SKIP_COMMERCIALS));
+    htsmsg_add_u32(r, "subtitleInTitle", !!(cfg->dvr_flags & DVR_SUBTITLE_IN_TITLE));
+    htsmsg_add_u32(r, "episodeBeforeDate", !!(cfg->dvr_flags & DVR_EPISODE_BEFORE_DATE));
 
     out = json_single_record(r, "dvrSettings");
 
@@ -1358,6 +1360,10 @@ extjs_dvr(http_connection_t *hc, const char *remain, void *opaque)
       flags |= DVR_TAG_FILES;
     if(http_arg_get(&hc->hc_req_args, "commSkip") != NULL)
       flags |= DVR_SKIP_COMMERCIALS;
+    if(http_arg_get(&hc->hc_req_args, "subtitleInTitle") != NULL)
+      flags |= DVR_SUBTITLE_IN_TITLE;
+    if(http_arg_get(&hc->hc_req_args, "episodeBeforeDate") != NULL)
+      flags |= DVR_EPISODE_BEFORE_DATE;
 
 
     dvr_flags_set(cfg,flags);
diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index 02021eb3..851f28aa 100644
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -729,7 +729,7 @@ tvheadend.dvrsettings = function() {
 	}, [ 'storage', 'postproc', 'retention', 'dayDirs', 'channelDirs',
 		'channelInTitle', 'container', 'dateInTitle', 'timeInTitle',
 		'preExtraTime', 'postExtraTime', 'whitespaceInTitle', 'titleDirs',
-		'episodeInTitle', 'cleanTitle', 'tagFiles', 'commSkip' ]);
+		'episodeInTitle', 'cleanTitle', 'tagFiles', 'commSkip', 'subtitleInTitle', 'episodeBeforeDate']);
 
 	var confcombo = new Ext.form.ComboBox({
 		store : tvheadend.configNames,
@@ -822,6 +822,12 @@ tvheadend.dvrsettings = function() {
 		}), new Ext.form.Checkbox({
 			fieldLabel : 'Skip commercials',
 			name : 'commSkip'
+		}), new Ext.form.Checkbox({
+			fieldLabel : 'Include subtitle in filename',
+			name : 'subtitleInTitle'
+		}), new Ext.form.Checkbox({
+			fieldLabel : 'Put episode in filename before date and time',
+			name : 'episodeBeforeDate'
 		}), {
 			width : 300,
 			fieldLabel : 'Post-processor command',