diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index a29b2acca..e839af34e 100644
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -1461,8 +1461,10 @@ class Pref_Feeds extends Handler_Protected {
 
 		print "<hr>";
 
+		$opml_export_filename = "TinyTinyRSS_".date("Y-m-d").".opml";
+
 		print "<p>" . __('Filename:') .
-            " <input type=\"text\" id=\"filename\" value=\"TinyTinyRSS.opml\" />&nbsp;" .
+            " <input type=\"text\" id=\"filename\" value=\"$opml_export_filename\" />&nbsp;" .
 				__('Include settings') . "<input type=\"checkbox\" id=\"settings\" checked=\"1\"/>";
 
 		print "</p><button dojoType=\"dijit.form.Button\"
diff --git a/plugins/import_export/init.php b/plugins/import_export/init.php
index e61b62b67..b6693f05c 100644
--- a/plugins/import_export/init.php
+++ b/plugins/import_export/init.php
@@ -106,11 +106,13 @@ class Import_Export extends Plugin implements IHandler {
 		if (file_exists($exportname)) {
 			header("Content-type: text/xml");
 
+			$timestamp_suffix = date("Y-m-d", filemtime($exportname));
+
 			if (function_exists('gzencode')) {
-				header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml.gz");
+				header("Content-Disposition: attachment; filename=TinyTinyRSS_exported_${timestamp_suffix}.xml.gz");
 				echo gzencode(file_get_contents($exportname));
 			} else {
-				header("Content-Disposition: attachment; filename=TinyTinyRSS_exported.xml");
+				header("Content-Disposition: attachment; filename=TinyTinyRSS_exported_${timestamp_suffix}.xml");
 				echo file_get_contents($exportname);
 			}
 		} else {