diff --git a/build.xml b/build.xml
index 5b5c9dfa..9d6f2773 100644
--- a/build.xml
+++ b/build.xml
@@ -61,6 +61,18 @@
                 <exclude name="lib/swt*.jar"/>
             </fileset>
         </zip>
+        <tar tarfile="dist/davmail-linux-x86-${version}.tgz" compression="gzip">
+            <tarfileset prefix="davmail-linux-x86-${version}" dir="dist" filemode="755">
+                <include name="davmail.sh"/>
+            </tarfileset>
+            <tarfileset prefix="davmail-linux-x86-${version}" dir="dist">
+                <include name="lib/*.jar"/>
+                <include name="*.jar"/>
+                <include name="lib/swt-*-gtk-linux-x86.jar"/>
+                <exclude name="lib/swt-*-carbon-macosx.jar"/>
+                <exclude name="lib/swt-*-win32-x86.jar"/>
+            </tarfileset>
+        </tar>
         <nsis script="davmail-setup.nsi" verbosity="4" out="build.log" noconfig="yes">
             <define name="VERSION" value="${version}"/>
         </nsis>
diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index 642718b3..76528a48 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -94,6 +94,7 @@ Section "MainSection" SEC01
   File "dist\lib\mail-1.3.2.jar"
   File "dist\lib\saxpath-1.0-FCS.jar"
   File "dist\lib\slide-webdavlib-2.1.jar"
+  File "dist\lib\swt-3.3-win32-win32-x86.jar"
   WriteRegStr HKEY_CURRENT_USER "Software\Microsoft\Windows\CurrentVersion\Run" "DavMail" "$INSTDIR\davmail.exe"
 SectionEnd
 
@@ -146,6 +147,7 @@ BailOut:
 no_quest:
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\lib\swt-3.3-win32-win32-x86.jar"
   Delete "$INSTDIR\lib\slide-webdavlib-2.1.jar"
   Delete "$INSTDIR\lib\saxpath-1.0-FCS.jar"
   Delete "$INSTDIR\lib\mail-1.3.2.jar"