diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 01914e0..17aef82 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -40,7 +40,7 @@ msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress
 [Files_uninstall]
 ; Example for recursively deleting the installation directory (don't forget the trailing backslash):
 ;
-; delete -sf "$InstallDir$\"
+delete -sf "$InstallDir$\"
 
 [Registry_uninstall]
 ; Example of deleting a registry key:
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index da46774..8d46a91 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -96,7 +96,7 @@ endif
 [Files_install]
 ; Example of recursively copying some files into the installation directory:
 ;
-; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
+copy -s "%ScriptPath%\X86\*.xpi" "$InstallDir$\distribution\extensions"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/Thunderbird-Setup-10.0.5esr.exe.sha1sum b/Thunderbird-Setup-10.0.5esr.exe.sha1sum
new file mode 100644
index 0000000..b839ccc
--- /dev/null
+++ b/Thunderbird-Setup-10.0.5esr.exe.sha1sum
@@ -0,0 +1 @@
+f97db74c5ac96c5768f69a0b4bf51953d16f9a3a  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/X86/Thunderbird-Setup-10.0.5esr.exe
diff --git a/Thunderbird-Setup-13.0.exe.sha1sum b/Thunderbird-Setup-13.0.exe.sha1sum
deleted file mode 100644
index 5cd8b5e..0000000
--- a/Thunderbird-Setup-13.0.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-e29fe2ec8a0ec8e6a0bdacba95730acd4102f711  /home/mario/.opsi-dist-cache/mozilla.thunderbird-13.0/X86/Thunderbird-Setup-13.0.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 78b9532..2cc8057 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -3,7 +3,7 @@
 ############################
 VENDOR="mozilla.org"
 PN="mozilla.thunderbird"
-VERSION="13.0"
+VERSION="10.0.5"
 RELEASE="1"
 PRIORITY="0"
 ADVICE=""
@@ -16,8 +16,38 @@ TYPE="public"
 DL_FILE[0]="Thunderbird-300x300.jpg"
 DL_SOURCE[0]="http://www.rebron.org/wordpress/wp-content/uploads/2009/07/Thunderbird-300x300.jpg"
 
-DL_FILE[1]="Thunderbird-Setup-${VERSION}.exe"
-DL_SOURCE[1]="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${VERSION}/win32/de/Thunderbird%20Setup%20${VERSION}.exe"
+DL_FILE[1]="Thunderbird-Setup-${VERSION}esr.exe"
+DL_SOURCE[1]="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${VERSION}esr/win32/de/Thunderbird%20Setup%20${VERSION}esr.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=InstallExe
 
+DL_FILE[2]="{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi"
+DL_SOURCE[2]="http://releases.mozilla.org/pub/mozilla.org/addons/2313/lightning-1.2.3-tb+sm-windows.xpi"
+DL_ARCH[2]="X86"
+DL_WINST_NAME[2]=LightningPluginXpi
+
+DL_FILE[3]="sogo-connector@inverse.ca.xpi"
+DL_SOURCE[3]="http://www.sogo.nu/files/downloads/extensions/sogo-connector-10.0.2.xpi"
+DL_ARCH[3]="X86"
+DL_WINST_NAME[3]=SogoConnectorPluginXpi
+
+DL_FILE[4]="{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi"
+DL_SOURCE[4]="http://releases.mozilla.org/pub/mozilla.org/addons/71/enigmail-1.4-sm+tb.xpi"
+DL_ARCH[4]="X86"
+DL_WINST_NAME[4]=EnigMailPluginXpi
+
+DL_FILE[5]="{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi"
+DL_SOURCE[5]="http://releases.mozilla.org/pub/mozilla.org/addons/611/signature_switch-1.6.9-tb.xpi"
+DL_ARCH[5]="X86"
+DL_WINST_NAME[5]=SignatureSwitchPluginXpi
+
+DL_FILE[6]="{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi"
+DL_SOURCE[6]="http://releases.mozilla.org/pub/mozilla.org/addons/4654/remove_duplicate_messages_alternate-0.3.8b-tb.xpi"
+DL_ARCH[6]="X86"
+DL_WINST_NAME[6]=RemoveDupMessagePluginXpi
+
+DL_FILE[7]="quickfolders@curious.be.xpi"
+DL_SOURCE[7]="http://releases.mozilla.org/pub/mozilla.org/addons/3254/quickfolders_tabbed_folders-3.6-sm+tb.xpi"
+DL_ARCH[7]="X86"
+DL_WINST_NAME[7]=QuickFolderPluginXpi
+
diff --git a/quickfolders@curious.be.xpi.sha1sum b/quickfolders@curious.be.xpi.sha1sum
new file mode 100644
index 0000000..9323e5b
--- /dev/null
+++ b/quickfolders@curious.be.xpi.sha1sum
@@ -0,0 +1 @@
+de4424783332b7f3c68f24ab594db9fb07115ed9  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/X86/quickfolders@curious.be.xpi
diff --git a/sogo-connector@inverse.ca.xpi.sha1sum b/sogo-connector@inverse.ca.xpi.sha1sum
new file mode 100644
index 0000000..3256779
--- /dev/null
+++ b/sogo-connector@inverse.ca.xpi.sha1sum
@@ -0,0 +1 @@
+176c420fb13ea329f015c0ee2ba28f72f888c87f  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/X86/sogo-connector@inverse.ca.xpi
diff --git a/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum b/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum
new file mode 100644
index 0000000..5e89d58
--- /dev/null
+++ b/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi.sha1sum
@@ -0,0 +1 @@
+96749bd664e975cbb2c78a8ca881702db71d9a12  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/X86/{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi
diff --git a/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum b/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum
new file mode 100644
index 0000000..5c56734
--- /dev/null
+++ b/{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi.sha1sum
@@ -0,0 +1 @@
+3d18c4afe47a16f71b688b6673f9aee20b330fe7  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/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
new file mode 100644
index 0000000..19adc9d
--- /dev/null
+++ b/{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi.sha1sum
@@ -0,0 +1 @@
+dd6635e72ccac1beb021aac9d21b41ecccc7713b  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/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
new file mode 100644
index 0000000..9f3f0d9
--- /dev/null
+++ b/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi.sha1sum
@@ -0,0 +1 @@
+99afd108dbdb081e2a0bfa3bce5e72ece9c577a9  /home/mario/.opsi-dist-cache/mozilla.thunderbird-10.0.5/X86/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi