diff --git a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
index c425dff52b..3c129771c6 100644
--- a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
+++ b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.addin
@@ -62,8 +62,8 @@
 	
 	<!-- Options panel -->
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
-	<OptionPanel id    = "CodeAnalysisOptionPanel"
+		<OptionPanel id    = "CodeAnalysisOptionPanel"
 		             label = "${res:ICSharpCode.CodeAnalysis}"
-		             class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanelXaml"/>
+		             class = "ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanel"/>
 	</Path>
 </AddIn>
diff --git a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
index 03f8e2d14c..7d36df78b8 100644
--- a/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
+++ b/src/AddIns/Analysis/CodeAnalysis/CodeAnalysis.csproj
@@ -60,8 +60,8 @@
     <Compile Include="..\..\..\Main\GlobalAssemblyInfo.cs">
       <Link>Configuration\GlobalAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="Src\AnalysisIdeOptionsPanelXaml.xaml.cs">
-      <DependentUpon>AnalysisIdeOptionsPanelXaml.xaml</DependentUpon>
+    <Compile Include="Src\AnalysisIdeOptionsPanel.xaml.cs">
+      <DependentUpon>AnalysisIdeOptionsPanel.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Src\old_AnalysisProjectOptionsPanel.cs" />
@@ -118,7 +118,7 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Src\AnalysisIdeOptionsPanelXaml.xaml" />
+    <Page Include="Src\AnalysisIdeOptionsPanel.xaml" />
     <Page Include="Src\AnalysisProjectOptionsPanelXaml.xaml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml
similarity index 98%
rename from src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml
rename to src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml
index 314430dfae..59fe0c8600 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanelXaml.xaml
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml
@@ -1,4 +1,4 @@
-<gui:OptionPanel x:Class="ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanelXaml"
+<gui:OptionPanel x:Class="ICSharpCode.CodeAnalysis.AnalysisIdeOptionsPanel"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:core="http://icsharpcode.net/sharpdevelop/core"
                  xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
new file mode 100644
index 0000000000..bfd0962423
--- /dev/null
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/AnalysisIdeOptionsPanel.xaml.cs
@@ -0,0 +1,64 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 19.07.2012
+ * Time: 21:27
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.IO;
+using ICSharpCode.Core;
+using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Gui.OptionPanels;
+
+namespace ICSharpCode.CodeAnalysis
+{
+	/// <summary>
+	/// Interaction logic for AnalysisIdeOptionsPanelXaml.xaml
+	/// </summary>
+	public partial class AnalysisIdeOptionsPanel : OptionPanel
+	{
+		public AnalysisIdeOptionsPanel()
+		{
+			InitializeComponent();
+			ShowStatus();
+		}
+		
+		
+		private void ShowStatus()
+		{
+			string path = FxCopWrapper.FindFxCopPath();
+			if (path == null) {
+				status.Text = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.IdeOptions.FxCopNotFound}");
+			} else {
+				status.Text = StringParser.Parse("${res:ICSharpCode.CodeAnalysis.IdeOptions.FxCopFoundInPath}")
+					+ Environment.NewLine + path;
+			}
+		}
+		
+		
+		private void FindFxCopPath_Click(object sender, System.Windows.RoutedEventArgs e)
+		{
+			string s = OptionsHelper.OpenFile("${res:SharpDevelop.FileFilter.ExecutableFiles}|*.exe;");
+			if (!String.IsNullOrEmpty(s)) {
+				string path = Path.GetDirectoryName(s);
+				if (FxCopWrapper.IsFxCopPath(path)) {
+					FxCopPath = path;
+				} else {
+					MessageService.ShowError("${res:ICSharpCode.CodeAnalysis.IdeOptions.DirectoryDoesNotContainFxCop}");
+				}
+			}
+			ShowStatus();
+		}
+		
+		
+		public static string FxCopPath {
+			get {
+				return PropertyService.Get("CodeAnalysis.FxCopPath");
+			}
+			set {
+				PropertyService.Set("CodeAnalysis.FxCopPath", value);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisIdeOptionsPanel.cs b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisIdeOptionsPanel.cs
index 3dd2bc63d5..f98c43f708 100644
--- a/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisIdeOptionsPanel.cs
+++ b/src/AddIns/Analysis/CodeAnalysis/Src/old_AnalysisIdeOptionsPanel.cs
@@ -13,7 +13,7 @@ namespace ICSharpCode.CodeAnalysis
 	/// <summary>
 	/// Option panel to choose the FxCop path from.
 	/// </summary>
-	public class AnalysisIdeOptionsPanel : XmlFormsOptionPanel
+	public class old_AnalysisIdeOptionsPanel : XmlFormsOptionPanel
 	{
 		public override void LoadPanelContents()
 		{