diff --git a/SharpDevelop.Tests.sln b/SharpDevelop.Tests.sln
index ec6adad7be..a934a07cfa 100644
--- a/SharpDevelop.Tests.sln
+++ b/SharpDevelop.Tests.sln
@@ -452,7 +452,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.Cmdlets.T
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PackageManagement.EnvDTEHelpers", "src\AddIns\Misc\PackageManagement\EnvDTEHelpers\Project\PackageManagement.EnvDTEHelpers.vbproj", "{F7886FB7-3764-4574-B981-25EB164B532E}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SharpDevelop.EnvDTE", "src\AddIns\Misc\PackageManagement\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj", "{6FB1260D-68A2-41A0-BB09-F5F710842E99}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}"
 	ProjectSection(SolutionItems) = postProject
@@ -2100,18 +2100,18 @@ Global
 		{7DB80259-24D4-46C3-A024-53FF1987733D}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7DB80259-24D4-46C3-A024-53FF1987733D}.Release|x86.Build.0 = Release|Any CPU
 		{7DB80259-24D4-46C3-A024-53FF1987733D}.Release|x86.ActiveCfg = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Win32.Build.0 = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.Build.0 = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Win32.Build.0 = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Win32.ActiveCfg = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.Build.0 = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.ActiveCfg = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Win32.Build.0 = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|x86.Build.0 = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Win32.Build.0 = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Win32.ActiveCfg = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|x86.Build.0 = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2216,7 +2216,7 @@ Global
 		{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144}
 		{11115C83-3DB1-431F-8B98-59040359238D} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144}
 		{A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144}
-		{F7886FB7-3764-4574-B981-25EB164B532E} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144}
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99} = {C6410CCE-C29F-4BF4-94BF-545DE1CBB144}
 		{AD8272AC-5C9E-4061-90FB-CEF15A9A3F41} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
 		{C7F29FC2-1B03-4CDD-9E30-400F4765FF04} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
diff --git a/SharpDevelop.sln b/SharpDevelop.sln
index 0fcadbf744..e8d4235174 100644
--- a/SharpDevelop.sln
+++ b/SharpDevelop.sln
@@ -279,7 +279,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement", "src\Ad
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PackageManagement.PowerShell", "src\AddIns\Misc\PackageManagement\PowerShell\Project\PackageManagement.PowerShell.csproj", "{A406803B-C584-43A3-BCEE-A0BB3132CB5F}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "PackageManagement.EnvDTEHelpers", "src\AddIns\Misc\PackageManagement\EnvDTEHelpers\Project\PackageManagement.EnvDTEHelpers.vbproj", "{F7886FB7-3764-4574-B981-25EB164B532E}"
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SharpDevelop.EnvDTE", "src\AddIns\Misc\PackageManagement\SharpDevelop.EnvDTE\SharpDevelop.EnvDTE.vbproj", "{6FB1260D-68A2-41A0-BB09-F5F710842E99}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelpViewer", "src\AddIns\Misc\HelpViewer\HelpViewer.csproj", "{80F76D10-0B44-4D55-B4BD-DAEB5464090C}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -1620,18 +1620,18 @@ Global
 		{7DB80259-24D4-46C3-A024-53FF1987733D}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7DB80259-24D4-46C3-A024-53FF1987733D}.Release|x86.Build.0 = Release|Any CPU
 		{7DB80259-24D4-46C3-A024-53FF1987733D}.Release|x86.ActiveCfg = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Win32.Build.0 = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.Build.0 = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Win32.Build.0 = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|Win32.ActiveCfg = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.Build.0 = Release|Any CPU
-		{F7886FB7-3764-4574-B981-25EB164B532E}.Release|x86.ActiveCfg = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Win32.Build.0 = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|x86.Build.0 = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Win32.Build.0 = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|Win32.ActiveCfg = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|x86.Build.0 = Release|Any CPU
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1710,7 +1710,7 @@ Global
 		{E0A5E80A-003B-4335-A9DC-A76E2E46D38D} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
 		{AE4AB0FA-6087-4480-AF37-0FA1452B3DA1} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
 		{A406803B-C584-43A3-BCEE-A0BB3132CB5F} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
-		{F7886FB7-3764-4574-B981-25EB164B532E} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
+		{6FB1260D-68A2-41A0-BB09-F5F710842E99} = {50B51AAA-80E3-4C4A-8B2D-CAF440A82B78}
 		{6B1CFE35-DA17-4DEB-9C6E-227E5E251DA0} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
 		{0008FCE9-9EB4-4E2E-979B-553278E5BBA6} = {DEFC8584-BEC3-4921-BD0F-40482E450B7B}
 		{85226AFB-CE71-4851-9A75-7EEC663A8E8A} = {11BF9245-88A3-4A0A-9A8A-EC9D98036B0F}
diff --git a/src/Setup/Files.wxs b/src/Setup/Files.wxs
index 7d20f3e487..9e523dc741 100644
--- a/src/Setup/Files.wxs
+++ b/src/Setup/Files.wxs
@@ -480,6 +480,9 @@
 							<Component Id="ICSharpCodeScriptingDll" Guid="62B44EFA-CCB4-4B73-B455-AE3C72B8121F" DiskId="1">
 								<File Id="ICSharpCode.Scripting.dll" Name="ICSharpCode.Scripting.dll" Source="..\..\bin\ICSharpCode.Scripting.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="ICSharpCode.Scripting.dll" AssemblyManifest="ICSharpCode.Scripting.dll" />
 							</Component>
+							<Component Id="SharpDevelopEnvDteDll" Guid="BEB5529F-D774-4C82-AA5A-AA877A64A79E" DiskId="1">
+								<File Id="SharpDevelop.EnvDTE.dll" Name="SharpDevelop.EnvDTE.dll" Source="..\..\bin\SharpDevelop.EnvDTE.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="SharpDevelop.EnvDTE.dll" AssemblyManifest="SharpDevelop.EnvDTE.dll" />
+							</Component>
 						</Directory>
 						<Directory Id="DocFolder" Name="doc">
 							<Component Guid="9DCED5AC-B771-4A4F-B4FE-69867BF2EBDE" Id="SharpDevelopDocFiles" DiskId="1">
@@ -1814,9 +1817,6 @@
 									<Component Id="NuGetConsoleTypesDll" Guid="7386637C-A6C6-4AD4-8EA3-C5E87AA3F552" DiskId="1">
 										<File Id="NuGet.Console.Types.dll" Name="NuGet.Console.Types.dll" Source="..\..\AddIns\Misc\PackageManagement\NuGet.Console.Types.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="NuGet.Console.Types.dll" AssemblyManifest="NuGet.Console.Types.dll" />
 									</Component>
-									<Component Id="PackageManagementEnvDTEHelpersDll" Guid="51609E3F-C1BA-4EB5-889B-61EA730207D6" DiskId="1">
-										<File Id="PackageManagement.EnvDTEHelpers.dll" Name="PackageManagement.EnvDTEHelpers.dll" Source="..\..\AddIns\Misc\PackageManagement\PackageManagement.EnvDTEHelpers.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="PackageManagement.EnvDTEHelpers.dll" AssemblyManifest="PackageManagement.EnvDTEHelpers.dll" />
-									</Component>
 								</Directory>
 								<Directory Id="TextTemplating" Name="TextTemplating">
 									<Component Id="MonoTextTemplatingDll" Guid="07BFBED7-FC7B-4CF3-BD00-DCA8E8E7C17B" DiskId="1">
diff --git a/src/Setup/Setup.wxs b/src/Setup/Setup.wxs
index 333b386264..8a4f88069f 100644
--- a/src/Setup/Setup.wxs
+++ b/src/Setup/Setup.wxs
@@ -533,7 +533,7 @@
 				<ComponentRef Id="PackageManagementCmdletsDll"/>
 				<ComponentRef Id="PackageManagementCmdletsDllHelpXml"/>
 				<ComponentRef Id="PackageManagementDll"/>
-				<ComponentRef Id="PackageManagementEnvDTEHelpersDll"/>
+				<ComponentRef Id="SharpDevelopEnvDteDll"/>
 				<ComponentRef Id="PackageManagementPowerShellDll"/>
 				<ComponentRef Id="JQuery172NuGetPackage"/>
 				<ComponentRef Id="Modernizr253NuGetPackage"/>