diff --git a/src/AddIns/BackendBindings/WixBinding/Project/SetupDialogControlLibrary.sdcl b/src/AddIns/BackendBindings/WixBinding/Project/SetupDialogControlLibrary.sdcl
index 580961c008..f1cf5dfb8c 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/SetupDialogControlLibrary.sdcl
+++ b/src/AddIns/BackendBindings/WixBinding/Project/SetupDialogControlLibrary.sdcl
@@ -1,7 +1,7 @@
 <SharpDevelopControlLibrary version="1.1.0">
   <Assemblies>
     <Assembly assembly="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <Assembly assembly="WixBinding, Culture=neutral" path=".\..\AddIns\AddIns\BackendBindings\WixBinding"/>
+    <Assembly assembly="WixBinding, Culture=neutral" path="${addinpath:ICSharpCode.WixBinding}"/>
   </Assemblies>
   <Categories>
     <Category name="Setup Dialog Controls" enabled="True">
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogControlsSideTab.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogControlsSideTab.cs
index be974bd227..ec0004ac19 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogControlsSideTab.cs
+++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/Gui/SetupDialogControlsSideTab.cs
@@ -31,7 +31,12 @@ namespace ICSharpCode.WixBinding
 		{
 			ComponentLibraryLoader loader = new ComponentLibraryLoader();
 			loader.LoadToolComponentLibrary(ToolComponentLibraryFileName);
+			
+			// Fix WixBinding assembly hint path.
 			Category category = (Category)loader.Categories[0];
+			foreach (ToolComponent toolComponent in category.ToolComponents) {
+				toolComponent.HintPath = StringParser.Parse(toolComponent.HintPath);
+			}
 			return new SetupDialogControlsSideTab(SharpDevelopSideBar.SideBar, category, ToolboxProvider.ToolboxService);
 		}
 		
diff --git a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin
index a5e39ec955..5feaa5fa26 100644
--- a/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin
+++ b/src/AddIns/BackendBindings/WixBinding/Project/WixBinding.addin
@@ -27,7 +27,7 @@
 	<Path name = "/SharpDevelop/Workbench/FileFilter">
 		<FileFilter id = "Wix"
 		            insertbefore="AllFiles"
-		            name = "WiX files (*.wxs;*.wxi))"
+		            name = "WiX files (*.wxs;*.wxi)"
 		            extensions = "*.wxs;*.wxi"/>
 	</Path>