diff --git a/Thunderbird-Setup-17.0.8esr.exe.sha1sum b/Thunderbird-Setup-17.0.8esr.exe.sha1sum
deleted file mode 100644
index 59ae989..0000000
--- a/Thunderbird-Setup-17.0.8esr.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-23b2abad4299bb286358984fd5a45c58f862d367  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/Thunderbird-Setup-17.0.8esr.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index b84d4da..7f0f9d2 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -5,7 +5,7 @@ VENDOR="mozilla.org"
 PN="mozilla.thunderbird"
 NAME="Mozilla Thunderbird"
 DESCRIPTION="Mozilla Thunderbird ist ein freier eMail Client des Mozilla-Projekts."
-VERSION="17.0.8"
+VERSION="17.0.9"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -35,31 +35,31 @@ DL_EXTRACT_TO[3]="Addons/bundles"
 DL_WINST_NAME[3]=SogoConnectorPluginXpi
 
 DL_FILE[4]="{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi"
-DL_SOURCE[4]="https://addons.cdn.mozilla.net/_files/_attachments/71/enigmail-1.5.2-sm+tb.xpi"
+DL_SOURCE[4]="https://addons.mozilla.org/thunderbird/downloads/latest/71/addon-71-latest.xpi"
 DL_ARCH[4]="X86"
 DL_EXTRACT_TO[4]="Addons/extensions"
 DL_WINST_NAME[4]=EnigMailPluginXpi
 
 DL_FILE[5]="{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi"
-DL_SOURCE[5]="https://addons.cdn.mozilla.net/_files/_attachments/611/signature_switch-1.6.11-tb.xpi"
+DL_SOURCE[5]="https://addons.mozilla.org/thunderbird/downloads/latest/611/addon-611-latest.xpi"
 DL_ARCH[5]="X86"
 DL_EXTRACT_TO[5]="Addons/bundles"
 DL_WINST_NAME[5]=SignatureSwitchPluginXpi
 
 DL_FILE[6]="{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi"
-DL_SOURCE[6]="https://addons.cdn.mozilla.net/_files/_attachments/4654/remove_duplicate_messages_alternate-0.3.8b-tb.xpi"
+DL_SOURCE[6]="https://addons.mozilla.org/thunderbird/downloads/latest/4654/addon-4654-latest.xpi"
 DL_ARCH[6]="X86"
 DL_EXTRACT_TO[6]="Addons/bundles"
 DL_WINST_NAME[6]=RemoveDupMessagePluginXpi
 
 DL_FILE[7]="quickfolders@curious.be.xpi"
-DL_SOURCE[7]="https://addons.cdn.mozilla.net/_files/_attachments/3254/quickfolders_tabbed_folders-3.11-tb+sm.xpi"
+DL_SOURCE[7]="https://addons.mozilla.org/thunderbird/downloads/latest/3254/addon-3254-latest.xpi"
 DL_ARCH[7]="X86"
 DL_EXTRACT_TO[7]="Addons/bundles"
 DL_WINST_NAME[7]=QuickFolderPluginXpi
 
 DL_FILE[8]="{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi"
-DL_SOURCE[8]="https://addons.cdn.mozilla.net/_files/_attachments/330424/printingtools-1.2.0.2-tb.xpi"
+DL_SOURCE[8]="https://addons.mozilla.org/thunderbird/downloads/file/169894/printingtools-1.2.0.2-tb.xpi"
 DL_ARCH[8]="X86"
 DL_EXTRACT_TO[8]="Addons/bundles"
 DL_WINST_NAME[8]=PrintingToolsPluginXpi
diff --git a/de_DE@dicts.j3e.de.xpi.sha1sum b/de_DE@dicts.j3e.de.xpi.sha1sum
index fc2b6d1..edd441b 100644
--- a/de_DE@dicts.j3e.de.xpi.sha1sum
+++ b/de_DE@dicts.j3e.de.xpi.sha1sum
@@ -1 +1 @@
-8e47a1348c966909a0db03cf59064b0edcc06df7  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/de_DE@dicts.j3e.de.xpi
+3e8046e8a596b4e9d72a10a31c4ec4156a6669f8  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/de_DE@dicts.j3e.de.xpi
diff --git a/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum b/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum
index 696a41b..a39afff 100644
--- a/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum
+++ b/en-US@dictionaries.addons.mozilla.org.xpi.sha1sum
@@ -1 +1 @@
-933d1dfaafecf9be772f83a859f9acb86b736f4b  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/en-US@dictionaries.addons.mozilla.org.xpi
+933d1dfaafecf9be772f83a859f9acb86b736f4b  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/en-US@dictionaries.addons.mozilla.org.xpi
diff --git a/quickfolders@curious.be.xpi.sha1sum b/quickfolders@curious.be.xpi.sha1sum
index 6e84dd9..e24990e 100644
--- a/quickfolders@curious.be.xpi.sha1sum
+++ b/quickfolders@curious.be.xpi.sha1sum
@@ -1 +1 @@
-768dcea5c7e1faf442d852a70a22f78ccd64cf8b  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/quickfolders@curious.be.xpi
+768dcea5c7e1faf442d852a70a22f78ccd64cf8b  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/quickfolders@curious.be.xpi
diff --git a/sogo-connector@inverse.ca.xpi.sha1sum b/sogo-connector@inverse.ca.xpi.sha1sum
index b80d4c2..7f3d919 100644
--- a/sogo-connector@inverse.ca.xpi.sha1sum
+++ b/sogo-connector@inverse.ca.xpi.sha1sum
@@ -1 +1 @@
-e0304b63adbe019fa5ea580d04fe54b160fac491  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/sogo-connector@inverse.ca.xpi
+e0304b63adbe019fa5ea580d04fe54b160fac491  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/sogo-connector@inverse.ca.xpi
diff --git a/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum b/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum
index 7d5db1a..95076b6 100644
--- a/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum
+++ b/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum
@@ -1 +1 @@
-dcfeeb4ce931639fabacfbe9d9b2799dc5939980  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi
+8154761d9cd58d5fdacedfb04c4e799a50b26c3a  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi
diff --git a/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum b/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum
index 521c020..cb264c2 100644
--- a/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum
+++ b/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi.sha1sum
@@ -1 +1 @@
-91e196f8af326d7920720faa3d851e9d4b3030fc  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi
+91e196f8af326d7920720faa3d851e9d4b3030fc  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi
diff --git a/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum b/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum
index 04cd598..1b261de 100644
--- a/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum
+++ b/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum
@@ -1 +1 @@
-da39a3ee5e6b4b0d3255bfef95601890afd80709  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi
+72454d09a0b7adab161a6a13c9ca6f25b78ceba2  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi
diff --git a/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum b/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum
index 178b9a2..8a797b7 100644
--- a/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum
+++ b/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum
@@ -1 +1 @@
-dd6635e72ccac1beb021aac9d21b41ecccc7713b  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi
+8051344c4010d191af6d5f47ffca0934cff3ac10  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi
diff --git a/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum b/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum
index e9ed5e5..2229dda 100644
--- a/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum
+++ b/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum
@@ -1 +1 @@
-5b4325872b9b0250db7cf6ddeb8879f9dc2bc4b3  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.8/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
+5b4325872b9b0250db7cf6ddeb8879f9dc2bc4b3  /home/mario/.opsi-dist-cache/mozilla.thunderbird-17.0.9/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi