diff --git a/ietf/mailtrigger/migrations/0003_rfc_recipients.py b/ietf/mailtrigger/migrations/0003_rfc_recipients.py
new file mode 100644
index 000000000..c8fee6a57
--- /dev/null
+++ b/ietf/mailtrigger/migrations/0003_rfc_recipients.py
@@ -0,0 +1,25 @@
+# Copyright The IETF Trust 2023, All Rights Reserved
+
+from django.db import migrations
+
+
+def forward(apps, schema_editor):
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    Recipient.objects.filter(slug="doc_authors").update(
+        template='{% if doc.type_id == "draft" or doc.type_id == "rfc" %}<{{doc.name}}@ietf.org>{% endif %}'
+    )
+
+
+def reverse(apps, schema_editor):
+    Recipient = apps.get_model("mailtrigger", "Recipient")
+    Recipient.objects.filter(slug="doc_authors").update(
+        template='{% if doc.type_id == "draft" %}<{{doc.name}}@ietf.org>{% endif %}'
+    )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("mailtrigger", "0002_slidesubmitter"),
+    ]
+
+    operations = [migrations.RunPython(forward, reverse)]
diff --git a/ietf/mailtrigger/utils.py b/ietf/mailtrigger/utils.py
index 496f20dc2..ea376c8f1 100644
--- a/ietf/mailtrigger/utils.py
+++ b/ietf/mailtrigger/utils.py
@@ -70,12 +70,20 @@ def gather_relevant_expansions(**kwargs):
 
         relevant.add('doc_state_edited')
         
-        if not doc.type_id in ['bofreq', 'statement']:
+        if not doc.type_id in ['bofreq', 'statement', 'rfc']:
             relevant.update(['doc_telechat_details_changed','ballot_deferred','iesg_ballot_saved'])
 
         if doc.type_id in ['draft','statchg']:
             relevant.update(starts_with('last_call_'))
 
+        if doc.type_id == 'rfc':
+            relevant.update([
+                'doc_added_comment',
+                'doc_external_resource_change_requested',
+                'doc_state_edited',
+                'ipr_posted_on_doc'
+            ])
+
         if doc.type_id == 'draft':
             relevant.update(starts_with('doc_'))
             relevant.update(starts_with('resurrection_'))