diff --git a/README.md b/README.md
index 63227835..b9e73d4e 100644
--- a/README.md
+++ b/README.md
@@ -1067,6 +1067,12 @@ url parameters:
   * `n` = filename
   * `a` = filesize
   * uppercase = reverse-sort; `M` = oldest file first
+* `rss-title-format={title}` format for RSS item titles, using tags or metadata (can also be set globally with `--rss-title-format`)
+  * available placeholders: `{title}`, `{artist}`, `{album}`, `{.tn}`, `{date}`, `{filename}`
+  * default: `{filename}`
+* `rss-desc-format={artist} - {title}` format for RSS item descriptions, using tags or metadata  (can also be set globally with `--rss-desc-format`)
+  * available placeholders: `{title}`, `{artist}`, `{album}`, `{.tn}`, `{date}`, `{filename}`
+  * default: `{filename}`
 
 
 ## opds feeds
diff --git a/copyparty/__main__.py b/copyparty/__main__.py
index 46ea633f..ff8a91cb 100644
--- a/copyparty/__main__.py
+++ b/copyparty/__main__.py
@@ -1695,8 +1695,8 @@ def add_rss(ap):
     ap2.add_argument("--rss-nf", metavar="HITS", type=int, default=250, help="default number of files to return (url-param 'nf')")
     ap2.add_argument("--rss-fext", metavar="E,E", type=u, default="", help="default list of file extensions to include (url-param 'fext'); blank=all")
     ap2.add_argument("--rss-sort", metavar="ORD", type=u, default="m", help="default sort order (url-param 'sort'); [\033[32mm\033[0m]=last-modified [\033[32mu\033[0m]=upload-time [\033[32mn\033[0m]=filename [\033[32ms\033[0m]=filesize; Uppercase=oldest-first. Note that upload-time is 0 for non-uploaded files")
-    ap2.add_argument("--rss-title", metavar="FMT", type=u, default="{filename}", help="format for RSS item title; available tags: {title}, {artist}, {album}, {.tn}, {date}, {filename}; default is '{title}' (falls back to filename if tag missing)")
-    ap2.add_argument("--rss-desc", metavar="FMT", type=u, default="{filename}", help="format for RSS item description; available tags: {title}, {artist}, {album}, {.tn}, {date}, {filename}; default is '{artist} - {title}' (falls back to filename if all tags missing)")
+    ap2.add_argument("--rss-title-format", metavar="FMT", type=u, default="{filename}", help="format for RSS item title; available tags: {title}, {artist}, {album}, {.tn}, {date}, {filename}; default is '{title}' (falls back to filename if tag missing)")
+    ap2.add_argument("--rss-desc-format", metavar="FMT", type=u, default="{filename}", help="format for RSS item description; available tags: {title}, {artist}, {album}, {.tn}, {date}, {filename}; default is '{artist} - {title}' (falls back to filename if all tags missing)")
 
 
 def add_db_general(ap, hcores):
diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py
index 9d0a2eac..88e19d0f 100644
--- a/copyparty/httpcli.py
+++ b/copyparty/httpcli.py
@@ -1541,8 +1541,8 @@ class HttpCli(object):
         use_magic = "rmagic" in self.vn.flags
 
         # Get format templates from config or URL params
-        title_fmt = self.uparam.get("title_fmt", self.args.rss_title)
-        desc_fmt = self.uparam.get("desc_fmt", self.args.rss_desc)
+        title_fmt = self.uparam.get("rss-title-format", self.args.rss_title_format)
+        desc_fmt = self.uparam.get("rss-desc-format", self.args.rss_desc_format)
 
         for i in hits:
             if use_magic: