Index: /branches/eraser6/Installer/Installer.wixproj
===================================================================
--- /branches/eraser6/Installer/Installer.wixproj	(revision 589)
+++ /branches/eraser6/Installer/Installer.wixproj	(revision 590)
@@ -33,4 +33,5 @@
     <Compile Include="DirectoryStructure.wxs" />
     <Compile Include="Eraser.wxs" />
+    <Compile Include="Localisations.wxs" />
     <Compile Include="UserInterface.wxs" />
   </ItemGroup>
Index: /branches/eraser6/Installer/Eraser.wxs
===================================================================
--- /branches/eraser6/Installer/Eraser.wxs	(revision 589)
+++ /branches/eraser6/Installer/Eraser.wxs	(revision 590)
@@ -22,6 +22,6 @@
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="3CD6BF73-CEF1-4648-B0C6-5F3370F80C7D" Name="Eraser" Language="1033" Version="6.0.0.1"
-			Manufacturer="The Eraser Project" UpgradeCode="F7C915E0-B081-4a80-97E2-FDA462FEDF05">
+	<Product Id="C71D72C1-1148-4ec5-8BD5-198C85AB0DDD" Name="Eraser" Language="1033" Version="6.0.0.2"
+			Manufacturer="The Eraser Project" UpgradeCode="D07F460B-E2B0-4cc5-A109-998CA9C2D4EA">
 		<Package Id="*" InstallerVersion="200" Compressed="yes" Keywords="Eraser"
 			Description="Eraser Installer" Manufacturer="The Eraser Project" />
@@ -39,4 +39,7 @@
 
 		<!-- Program upgrades-->
+		<Upgrade Id ="D07F460B-E2B0-4cc5-A109-998CA9C2D4EA">
+			<UpgradeVersion Property="ERASERUPDATE" Minimum="6.0.0.0" OnlyDetect="no" />
+		</Upgrade>
 		<InstallExecuteSequence>
 			<RemoveExistingProducts After="InstallInitialize" />
@@ -66,13 +69,6 @@
 			<ComponentRef Id="EraserPlugins" />
 			<ComponentRef Id="EraserPluginsLangEn" />
-
-			<Feature Id="EraserLanguages" Title="Alternative Languages"
-					Description="Alternative localised version of Eraser." Level="10"
-					Display="expand">
-				<Feature Id="EraserLanguagesNl" Title="Dutch" Description="Dutch localisation" Level="10">
-					<ComponentRef Id="EraserLangNl" />
-					<ComponentRef Id="EraserPluginsLangNl" />
-				</Feature>
-			</Feature>
+			
+			<FeatureRef Id="EraserLanguages" />
 		</Feature>
 	</Product>
Index: /branches/eraser6/Installer/Localisations.wxs
===================================================================
--- /branches/eraser6/Installer/Localisations.wxs	(revision 590)
+++ /branches/eraser6/Installer/Localisations.wxs	(revision 590)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * $Id$
+ * Copyright 2008 The Eraser Project
+ * Original Author: Joel Low <lowjoel@users.sourceforge.net>
+ * Modified By:
+ *
+ * This file is part of Eraser.
+ *
+ * Eraser is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * Eraser is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * A copy of the GNU General Public License can be found at
+ * <http://www.gnu.org/licenses/>.
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment Id="EraserLocalisationsFragment">
+		<DirectoryRef Id="INSTALLLOCATION">
+			<Directory Id="EraserLangNlDir" Name="nl">
+				<Component Id="EraserLangNl" Guid="A404FC89-2216-4e14-96D5-30F54D120FBB">
+					<File Id="EraserNl" Name="Eraser.resources.dll"
+						Source="..\bin\Release\nl\Eraser.resources.dll"
+						ProcessorArchitecture="msil" />
+				</Component>
+			</Directory>
+		</DirectoryRef>
+		<DirectoryRef Id="EraserPluginsDir">
+			<Directory Id="EraserPluginsLangNlDir" Name="nl">
+				<Component Id="EraserPluginsLangNl" Guid="CD85AC3F-2B4E-4ac8-8FF9-6BD3BC90BD3D">
+					<File Id="EraserDefaultPluginsNl" Name="Eraser.DefaultPlugins.resources.dll"
+						Source="..\bin\Release\Plugins\nl\Eraser.DefaultPlugins.resources.dll"
+						ProcessorArchitecture="msil" />
+				</Component>
+			</Directory>
+		</DirectoryRef>
+
+		<!-- Reference all languages in Localisations.wxs -->
+		<Feature Id="EraserLanguages" Title="Alternative Languages"
+				Description="Alternative localised version of Eraser." Level="10"
+				Display="expand">
+			<Feature Id="EraserLanguagesNl" Title="Dutch" Description="Dutch localisation" Level="10">
+				<ComponentRef Id="EraserLangNl" />
+				<ComponentRef Id="EraserPluginsLangNl" />
+			</Feature>
+		</Feature>
+	</Fragment>
+</Wix>
Index: /branches/eraser6/Installer/DirectoryStructure.wxs
===================================================================
--- /branches/eraser6/Installer/DirectoryStructure.wxs	(revision 589)
+++ /branches/eraser6/Installer/DirectoryStructure.wxs	(revision 590)
@@ -48,11 +48,4 @@
 					</Component>
 				</Directory>
-				<Directory Id="EraserLangNlDir" Name="nl">
-					<Component Id="EraserLangNl" Guid="A404FC89-2216-4e14-96D5-30F54D120FBB">
-						<File Id="EraserNl" Name="Eraser.resources.dll"
-							Source="..\bin\Release\nl\Eraser.resources.dll"
-							ProcessorArchitecture="msil" />
-					</Component>
-				</Directory>
 
 				<Directory Id="EraserPluginsDir" Name="Plugins">
@@ -73,11 +66,4 @@
 						</Component>
 					</Directory>
-					<Directory Id="EraserPluginsLangNlDir" Name="nl">
-						<Component Id="EraserPluginsLangNl" Guid="CD85AC3F-2B4E-4ac8-8FF9-6BD3BC90BD3D">
-							<File Id="EraserDefaultPluginsNl" Name="Eraser.DefaultPlugins.resources.dll"
-								Source="..\bin\Release\Plugins\nl\Eraser.DefaultPlugins.resources.dll"
-								ProcessorArchitecture="msil" />
-						</Component>
-					</Directory>
 				</Directory>
 			</Directory>