diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs
index 3f7b062e0d..eac36e71f0 100644
--- a/src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs
+++ b/src/Main/Core/Project/Src/AddInTree/AddIn/AddInReference.cs
@@ -96,11 +96,11 @@ namespace ICSharpCode.Core
 				}
 				
 				if (reference.Name == "SharpDevelop") {
-					// HACK: SD 4.1/4.2 AddIns work with SharpDevelop 4.3
+					// HACK: SD 4.1/4.2/4.3 AddIns work with SharpDevelop 4.4
 					// Because some 4.1 AddIns restrict themselves to SD 4.1, we extend the
 					// supported SD range.
-					if (reference.maximumVersion == new Version("4.1") || reference.maximumVersion == new Version("4.2")) {
-						reference.maximumVersion = new Version("4.3");
+					if (reference.maximumVersion == new Version("4.1") || reference.maximumVersion == new Version("4.2") || reference.maximumVersion == new Version("4.3")) {
+						reference.maximumVersion = new Version("4.4");
 					}
 				}
 			}
diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template
index fb17b850da..f84d6899bf 100644
--- a/src/Main/GlobalAssemblyInfo.template
+++ b/src/Main/GlobalAssemblyInfo.template
@@ -27,8 +27,8 @@ using System.Reflection;
 internal static class RevisionClass
 {
 	public const string Major = "4";
-	public const string Minor = "3";
-	public const string Build = "3";
+	public const string Minor = "4";
+	public const string Build = "0";
 	public const string Revision = "$INSERTREVISION$";
 	public const string VersionName = null;	// "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1")
 	
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 2b7eaa8503..7f05ac4604 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -1776,7 +1776,7 @@
 			</Directory>
 			<!-- SharpDevelop Start menu folder -->
 			<Directory Id="ProgramMenuFolder" Name="Programs">
-				<Component Id="SharpDevelopProgramMenuItems" Guid="D0C47C33-1DD1-41DF-BB48-968C7B4F7C08">
+				<Component Id="SharpDevelopProgramMenuItems" Guid="C75B0E33-A46E-40D7-A491-87F74999A824">
 					<!--
 						Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
 						http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
@@ -1787,7 +1787,7 @@
 			</Directory>
 			<!-- Desktop shortcuts -->
 			<Directory Id="DesktopFolder" Name="Desktop">
-				<Component Id="DesktopFolderItems" Guid="1443FDA1-E22B-4B84-B321-F12960D3FF36">
+				<Component Id="DesktopFolderItems" Guid="BD777F5F-9B51-4A9D-A782-9AA12F88F260">
 					<!--
 						Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
 						http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index d9ac3b2db1..abcb902c49 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -16,7 +16,7 @@
 		Manufacturer="ic#code"
 		Language="1033"
 		Codepage="1252"
-		UpgradeCode="EAB97D14-7713-4001-98E0-0414F495ECB8"
+		UpgradeCode="98D66C2A-31EE-4264-92D5-54BD8211461C"
 		Version="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)">
 		
 		<!-- When a new major SharpDevelop version should be allowed to be installed in parallel to old versions,
@@ -28,11 +28,11 @@
 			Compressed="yes"/>
 		
 		<!-- Upgrade information -->
-		<Upgrade Id="EAB97D14-7713-4001-98E0-0414F495ECB8">
+		<Upgrade Id="98D66C2A-31EE-4264-92D5-54BD8211461C">
 			<!-- The UpgradeCode must be changed to allow two versions of SharpDevelop to be installed side-by-side -->
 			
 			<!-- Checks for older versions -->
-			<UpgradeVersion Minimum="4.3.0"
+			<UpgradeVersion Minimum="4.4.0"
 				IncludeMinimum="yes"
 				Maximum="$(var.PRODUCTMAJORVERSION).$(var.PRODUCTBUILDVERSION)"
 				IncludeMaximum="no"