Index: src/TortoiseSVNSetup/Includes.wxi
===================================================================
--- src/TortoiseSVNSetup/Includes.wxi	(revision 4686)
+++ src/TortoiseSVNSetup/Includes.wxi	(working copy)
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Include Id="TsvnInclude">
 	<!-- This gets automatically generated by MakeMsi.bat running SubWCRev.exe on VersionNumberInclude.in.wxi -->
 	<?include VersionNumberInclude.wxi ?>
 
 	<!-- General ..................................................................... -->
-	<?define VersionNumber="$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)" ?>
+	<?define VersionNumberInternal="$(var.MajorVersion).$(var.MinorVersion).$(var.BuildVersion)" ?>
+	<?define VersionNumberUserVisible="$(var.MajorVersion).$(var.MinorVersion).$(var.MicroVersion).$(var.BuildVersion)" ?>
 	<?define ProductName="TortoiseSVN" ?>
 
 	<?define PackageKeywords="Sourcecontrol Subversion Shell" ?>
 	<?define PackageDescription="Subversion Client" ?>
-	<?define PackageComments="Windows Shell Integration For SubVersion Source Control, v$(var.VersionNumber)" ?>
+	<?define PackageComments="Windows Shell Integration For SubVersion Source Control, v$(var.VersionNumberUserVisible)" ?>
 	<?define PackageManufacturer="Stefan Kueng" ?>
 	<?define TortoiseSvnOrg="http://www.tortoisesvn.org/"?>
 
Index: src/TortoiseSVNSetup/TortoiseSVN.wxs
===================================================================
--- src/TortoiseSVNSetup/TortoiseSVN.wxs	(revision 4686)
+++ src/TortoiseSVNSetup/TortoiseSVN.wxs	(working copy)
@@ -5,7 +5,7 @@
 		UpgradeCode="$(var.UpgradeGuid)" 
   	Name="$(var.ProductName)" 
 		Id="????????-????-????-????-????????????"
-		Version="$(var.VersionNumber)"
+		Version="$(var.VersionNumberInternal)"
 		Manufacturer="TortoiseSVN" 
 		Language="1033">
 		<Package
@@ -22,10 +22,10 @@
 
 		<Upgrade Id="$(var.UpgradeGuid)" >
 			<!-- upgrade is flagged if current-install is newer than or equal to package - TODO: should make a dialog appear asking user to confirm downgrade.  -->
-			<UpgradeVersion Property="NEWERVERSIONDETECTED" Minimum="$(var.VersionNumber)" OnlyDetect="yes" />
+			<UpgradeVersion Property="NEWERVERSIONDETECTED" Minimum="$(var.VersionNumberInternal)" OnlyDetect="yes" />
 
 			<!-- flag is set if the install will trigger an upgrade of an existing install -->
-			<UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Maximum="$(var.VersionNumber)" IncludeMaximum="no" />
+			<UpgradeVersion Property="PREVIOUSVERSIONSINSTALLED" Maximum="$(var.VersionNumberInternal)" IncludeMaximum="no" />
 		</Upgrade>
 
 		<Media Id="1" Cabinet="TSVN.cab" EmbedCab="yes" CompressionLevel="high" />
Index: src/TortoiseSVNSetup/UIFragment.wxs
===================================================================
--- src/TortoiseSVNSetup/UIFragment.wxs	(revision 4686)
+++ src/TortoiseSVNSetup/UIFragment.wxs	(working copy)
@@ -510,7 +510,7 @@
 					<Text>{\VerdanaBold13}Welcome to the [ProductName] [Wizard]</Text>
 				</Control>
 				<Control Id="DialogDescription" Type="Text" X="135" Y="70" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-					<Text>The [Wizard] will allow you to change the way [ProductName] features are installed on your computer or even to remove [ProductName] v$(var.VersionNumber) from your computer. Click Next to continue or Cancel to exit the [Wizard].</Text>
+					<Text>The [Wizard] will allow you to change the way [ProductName] features are installed on your computer or even to remove [ProductName] v$(var.VersionNumberUserVisible) from your computer. Click Next to continue or Cancel to exit the [Wizard].</Text>
 				</Control>
 				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
 			</Dialog>
@@ -789,7 +789,7 @@
 					<Text>{\VerdanaBold13}Welcome to the [ProductName] [Wizard]</Text>
 				</Control>
 				<Control Id="DialogDescription" Type="Text" X="135" Y="90" Width="220" Height="30" Transparent="yes" NoPrefix="yes">
-					<Text>The [Wizard] will install [ProductName] v$(var.VersionNumber) on your computer. Click Next to continue or Cancel to exit the [Wizard].</Text>
+					<Text>The [Wizard] will install [ProductName] v$(var.VersionNumberUserVisible) on your computer. Click Next to continue or Cancel to exit the [Wizard].</Text>
 				</Control>
 				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
 			</Dialog>