diff --git a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin b/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
index f031c42ae7..f0e02e5011 100644
--- a/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
+++ b/src/AddIns/Misc/ComponentInspector/ComponentInspector.AddIn/ComponentInspector.addin
@@ -1,31 +1,34 @@
-<AddIn name="ComponentInspectorAddIn" 
-       author="Matt Ward" 
+<AddIn name="ComponentInspectorAddIn"
+       author="Matt Ward"
        url="http://oaklandsoftware.com/"
        copyright="prj:///doc/copyright.txt"
        description="Component Inspector AddIn for SharpDevelop">
-
+	
 	<Manifest>
 		<Identity name="ICSharpCode.ComponentInspector"/>
 	</Manifest>
-
+	
 	<Runtime>
+		<Condition name = "Compare" string = "${Platform}" equals = "Win64">
+			<DisableAddIn message = "This AddIn does not work when SharpDevelop runs as 64-bit process."/>
+		</Condition>
 		<Import assembly="ComponentInspector.AddIn.dll"/>
 	</Runtime>
-
+	
 	<Path name="/Workspace/Tools">
 		<MenuItem id="ShowComponentInspector"
 		          insertafter="ShowAddInScout"
-		          label="${res:ComponentInspector.ToolsMenu.ShowComponentInspectorMenuItem}" 
+		          label="${res:ComponentInspector.ToolsMenu.ShowComponentInspectorMenuItem}"
 		          class="ICSharpCode.ComponentInspector.AddIn.ShowComponentInspectorCommand"/>
 	</Path>
-
+	
 	<Path name="/SharpDevelop/Workbench/MainMenu">
 		<Condition name="WindowActive" activewindow="ICSharpCode.ComponentInspector.AddIn.ComponentInspectorView">
-				<MenuItem id="ComponentInspector"
-				          insertafter="Tools"
-				          insertbefore="Window"
-				          label="${res:ComponentInspector.MainMenu.InspectorMenu}"
-				          type="Menu">
+			<MenuItem id="ComponentInspector"
+			          insertafter="Tools"
+			          insertbefore="Window"
+			          label="${res:ComponentInspector.MainMenu.InspectorMenu}"
+			          type="Menu">
 				<MenuItem id="OpenAssembly"
 				          label="${res:ComponentInspector.InspectorMenu.OpenAssembly}"
 				          class="ICSharpCode.ComponentInspector.AddIn.OpenAssemblyCommand"/>
@@ -39,7 +42,7 @@
 			</MenuItem>
 		</Condition>
 	</Path>
-
+	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog">
 		<DialogPanel id="ComponentInspectorOptions"
 		             label="${res:ComponentInspector.ToolsMenu.ShowComponentInspectorMenuItem}"
diff --git a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
index d6b3c036fa..84c1cb663c 100644
--- a/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
+++ b/src/AddIns/Misc/SubversionAddIn/Project/ICSharpCode.Svn.addin
@@ -9,7 +9,7 @@
 	
 	<Runtime>
 		<Condition name = "Compare" string = "${Platform}" equals = "Win64">
-			<DisableAddIn message = "This AddIn does not work in the x64 Edition of Windows."/>
+			<DisableAddIn message = "This AddIn does not work when SharpDevelop runs as 64-bit process."/>
 		</Condition>
 		<Import assembly = "SubversionAddIn.dll">
 			<ConditionEvaluator name="SubversionState" class="ICSharpCode.Svn.SubversionStateCondition"/>