diff --git a/UNDF-REGISTRY.json b/UNDF-REGISTRY.json
index 2cd56609c..767a93ee9 100644
--- a/UNDF-REGISTRY.json
+++ b/UNDF-REGISTRY.json
@@ -884,5 +884,11 @@
   "openscad-0001": "UNDF-2026-000000883",
   "pcsx2-0001-0001": "UNDF-2026-000000884",
   "pcsx2-0002-0002": "UNDF-2026-000000885",
-  "wine-0001-0001": "UNDF-2026-000000886"
+  "wine-0001-0001": "UNDF-2026-000000886",
+  "thunderbird-0001-0001": "UNDF-2026-000000887",
+  "thunderbird-0002-0002": "UNDF-2026-000000888",
+  "thunderbird-0003-0003": "UNDF-2026-000000889",
+  "thunderbird-0004-0004": "UNDF-2026-000000890",
+  "thunderbird-0005-0005": "UNDF-2026-000000891",
+  "thunderbird-0006-0006": "UNDF-2026-000000892"
 }
diff --git a/defects/thunderbird-0001/patch/thunderbird-0001_nsMsgAccountManager_LoadAccounts_indexOf_ON2.patch b/defects/thunderbird-0001/patch/thunderbird-0001_nsMsgAccountManager_LoadAccounts_indexOf_ON2.patch
index 56edffd6f..57c4ea101 100644
--- a/defects/thunderbird-0001/patch/thunderbird-0001_nsMsgAccountManager_LoadAccounts_indexOf_ON2.patch
+++ b/defects/thunderbird-0001/patch/thunderbird-0001_nsMsgAccountManager_LoadAccounts_indexOf_ON2.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000000887
 --- a/mailnews/base/src/nsMsgAccountManager.cpp
 +++ b/mailnews/base/src/nsMsgAccountManager.cpp
 @@ -description
diff --git a/defects/thunderbird-0002/patch/thunderbird-0002_nsMsgCopyService_DoNextCopy_ContainsObject_ON2.patch b/defects/thunderbird-0002/patch/thunderbird-0002_nsMsgCopyService_DoNextCopy_ContainsObject_ON2.patch
index bb160fd81..18e7e7ba7 100644
--- a/defects/thunderbird-0002/patch/thunderbird-0002_nsMsgCopyService_DoNextCopy_ContainsObject_ON2.patch
+++ b/defects/thunderbird-0002/patch/thunderbird-0002_nsMsgCopyService_DoNextCopy_ContainsObject_ON2.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000000888
 --- a/mailnews/base/src/nsMsgCopyService.cpp
 +++ b/mailnews/base/src/nsMsgCopyService.cpp
 @@ -description
diff --git a/defects/thunderbird-0003/patch/thunderbird-0003_nsAutoSyncManager_IndexOf_ON2.patch b/defects/thunderbird-0003/patch/thunderbird-0003_nsAutoSyncManager_IndexOf_ON2.patch
index b4841aba2..0548c7fb8 100644
--- a/defects/thunderbird-0003/patch/thunderbird-0003_nsAutoSyncManager_IndexOf_ON2.patch
+++ b/defects/thunderbird-0003/patch/thunderbird-0003_nsAutoSyncManager_IndexOf_ON2.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000000889
 --- a/mailnews/imap/src/nsAutoSyncManager.cpp
 +++ b/mailnews/imap/src/nsAutoSyncManager.cpp
 @@ -description
diff --git a/defects/thunderbird-0004/patch/thunderbird-0004_nsImapFlagAndUidState_Contains_linear_on_sorted.patch b/defects/thunderbird-0004/patch/thunderbird-0004_nsImapFlagAndUidState_Contains_linear_on_sorted.patch
index aaa142217..82c22c815 100644
--- a/defects/thunderbird-0004/patch/thunderbird-0004_nsImapFlagAndUidState_Contains_linear_on_sorted.patch
+++ b/defects/thunderbird-0004/patch/thunderbird-0004_nsImapFlagAndUidState_Contains_linear_on_sorted.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000000890
 --- a/mailnews/imap/src/nsImapFlagAndUidState.cpp
 +++ b/mailnews/imap/src/nsImapFlagAndUidState.cpp
 @@ -description
diff --git a/defects/thunderbird-0005/patch/thunderbird-0005_nsMsgFilterList_ComputeArbitraryHeaders_ON2.patch b/defects/thunderbird-0005/patch/thunderbird-0005_nsMsgFilterList_ComputeArbitraryHeaders_ON2.patch
index 3d7dd29d2..9a12ff228 100644
--- a/defects/thunderbird-0005/patch/thunderbird-0005_nsMsgFilterList_ComputeArbitraryHeaders_ON2.patch
+++ b/defects/thunderbird-0005/patch/thunderbird-0005_nsMsgFilterList_ComputeArbitraryHeaders_ON2.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000000891
 --- a/mailnews/search/src/nsMsgFilterList.cpp
 +++ b/mailnews/search/src/nsMsgFilterList.cpp
 @@ -description
diff --git a/defects/thunderbird-0006/patch/thunderbird-0006_nsSpamSettings_CheckWhiteList_ON2.patch b/defects/thunderbird-0006/patch/thunderbird-0006_nsSpamSettings_CheckWhiteList_ON2.patch
index d82e72273..fd9090538 100644
--- a/defects/thunderbird-0006/patch/thunderbird-0006_nsSpamSettings_CheckWhiteList_ON2.patch
+++ b/defects/thunderbird-0006/patch/thunderbird-0006_nsSpamSettings_CheckWhiteList_ON2.patch
@@ -1,3 +1,4 @@
+# UNDF: UNDF-2026-000000892
 --- a/mailnews/base/src/nsSpamSettings.cpp
 +++ b/mailnews/base/src/nsSpamSettings.cpp
 @@ -description