diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
index 70853f90b3..f6da6d99ea 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlSchemaAssociation.cs
@@ -107,6 +107,9 @@ namespace ICSharpCode.XmlEditor
 				case ".manifest":
 					association = new XmlSchemaAssociation(extension, @"urn:schemas-microsoft-com:asm.v1");
 					break;					
+				case ".xaml":
+					association = new XmlSchemaAssociation(extension, @"http://schemas.microsoft.com/winfx/avalon/2005");
+					break;
 				default:
 					association = new XmlSchemaAssociation(extension);
 					break;
diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
index 0fe1a4d163..b3b1c8066b 100644
--- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
+++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin
@@ -23,7 +23,7 @@
 	<!-- Xml parser used to initiate the folding update -->
 	<Path name = "/Workspace/Parser">
 		<Parser id = "XmlFoldingParser"
-		        supportedextensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets"
+		        supportedextensions  = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.build;.xfrm;.targets;.xaml;.xpt;.xft"
 		        class = "ICSharpCode.XmlEditor.Parser"/>
 	</Path>
 	
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Resources/SyntaxModes.xml b/src/Libraries/ICSharpCode.TextEditor/Project/Resources/SyntaxModes.xml
index ac49a0f2a7..27b9cde344 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Resources/SyntaxModes.xml
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Resources/SyntaxModes.xml
@@ -49,5 +49,5 @@
 	
 	<Mode file       = "XML-Mode.xshd"
 	      name       = "XML"
-	      extensions = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets"/>
+	      extensions = ".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets;.xaml;.xpt;.xft"/>
 </SyntaxModes>
diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Resources/XML-Mode.xshd b/src/Libraries/ICSharpCode.TextEditor/Project/Resources/XML-Mode.xshd
index e941345ea5..9959402dce 100644
--- a/src/Libraries/ICSharpCode.TextEditor/Project/Resources/XML-Mode.xshd
+++ b/src/Libraries/ICSharpCode.TextEditor/Project/Resources/XML-Mode.xshd
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!-- syntaxdefinition for XML 2000 by Mike Krueger -->
-<SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets">
+<SyntaxDefinition name="XML" extensions=".xml;.xsl;.xslt;.xsd;.manifest;.config;.addin;.xshd;.wxs;.proj;.csproj;.vbproj;.ilproj;.booproj;.build;.xfrm;.targets;.xaml;.xpt;.xft">
 	
 	<Properties>
 		<Property name="BlockCommentBegin" value="&lt;!--"/>