diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
index 465947c654..36f3f87eab 100644
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -308,6 +308,7 @@
       <DependentUpon>AssemblyInfoPanel.xaml</DependentUpon>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\AssemblyInfo\AssemblyInfoProvider.cs" />
+    <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\AssemblyInfo\AssemblyInfoViewModel.cs" />
     <Compile Include="Src\Gui\Dialogs\OptionPanels\ProjectOptions\AssemblyInfo\VersionToStringConverter.cs" />
     <Compile Include="Src\Gui\Pads\CompilerMessageView\MessageViewCategoryTextWriter.cs" />
     <Compile Include="Src\Gui\Pads\TaskList\TaskViewResources.xaml.cs">
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
index 494e38dafa..c91e5d467c 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoPanel.xaml
@@ -7,7 +7,7 @@
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
     xmlns:optionPanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
     mc:Ignorable="d"
-	d:DataContext="{d:DesignInstance Type={x:Type optionPanels:AssemblyInfo}}">
+	d:DataContext="{d:DesignInstance Type={x:Type optionPanels:AssemblyInfoViewModel}}">
 	<ScrollViewer VerticalScrollBarVisibility="Auto">
 		<Grid>
 			<Grid.Resources>
@@ -19,13 +19,10 @@
 					<Setter Property="Margin" Value="4"/>
 					<Setter Property="VerticalAlignment" Value="Center"/>
                     <Setter Property="Validation.ErrorTemplate" Value="{x:Null}"/>
-					<EventSetter Event="TextChanged" Handler="OnPanelOptionsChanged"/>
 				</Style>
 				<Style TargetType="{x:Type CheckBox}">
 					<Setter Property="Margin" Value="4"/>
 					<Setter Property="VerticalAlignment" Value="Center"/>
-					<EventSetter Event="Checked" Handler="OnPanelOptionsChanged"/>
-					<EventSetter Event="Unchecked" Handler="OnPanelOptionsChanged"/>
 				</Style>
                 <optionPanels:VersionToStringConverter x:Key="VersionToStringConverter"/>
 			</Grid.Resources>
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs
new file mode 100644
index 0000000000..9a356985fe
--- /dev/null
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/AssemblyInfo/AssemblyInfoViewModel.cs
@@ -0,0 +1,111 @@
+using System;
+using ICSharpCode.SharpDevelop.Widgets;
+
+namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
+{
+	public class AssemblyInfoViewModel : ViewModelBase
+	{
+		private readonly AssemblyInfo assemblyInfo;
+
+		public AssemblyInfoViewModel(AssemblyInfo assemblyInfo)
+		{
+			this.assemblyInfo = assemblyInfo;
+		}
+
+		public string Title
+		{
+			get { return assemblyInfo.Title; }
+			set { assemblyInfo.Title = value; OnPropertyChanged(); }
+		}
+
+		public string Description
+		{
+			get { return assemblyInfo.Description; }
+			set { assemblyInfo.Description = value; OnPropertyChanged(); }
+		}
+
+		public string Company
+		{
+			get { return assemblyInfo.Company; }
+			set { assemblyInfo.Company = value; OnPropertyChanged(); }
+		}
+
+		public string Product
+		{
+			get { return assemblyInfo.Product; }
+			set { assemblyInfo.Product = value; OnPropertyChanged(); }
+		}
+
+		public string Copyright
+		{
+			get { return assemblyInfo.Copyright; }
+			set { assemblyInfo.Copyright = value; OnPropertyChanged(); }
+		}
+
+		public string Trademark
+		{
+			get { return assemblyInfo.Trademark; }
+			set { assemblyInfo.Trademark = value; OnPropertyChanged(); }
+		}
+
+		public string DefaultAlias
+		{
+			get { return assemblyInfo.DefaultAlias; }
+			set { assemblyInfo.DefaultAlias = value; OnPropertyChanged(); }
+		}
+
+		public Version AssemblyVersion
+		{
+			get { return assemblyInfo.AssemblyVersion; }
+			set { assemblyInfo.AssemblyVersion = value; OnPropertyChanged(); }
+		}
+
+		public Version AssemblyFileVersion
+		{
+			get { return assemblyInfo.AssemblyFileVersion; }
+			set { assemblyInfo.AssemblyFileVersion = value; OnPropertyChanged(); }
+		}
+
+		public Version InformationalVersion
+		{
+			get { return assemblyInfo.InformationalVersion; }
+			set { assemblyInfo.InformationalVersion = value; OnPropertyChanged(); }
+		}
+
+		public Guid? Guid
+		{
+			get { return assemblyInfo.Guid; }
+			set { assemblyInfo.Guid = value; OnPropertyChanged(); }
+		}
+
+		public string NeutralLanguage
+		{
+			get { return assemblyInfo.NeutralLanguage; }
+			set { assemblyInfo.NeutralLanguage = value; OnPropertyChanged(); }
+		}
+
+		public bool ComVisible
+		{
+			get { return assemblyInfo.ComVisible; }
+			set { assemblyInfo.ComVisible = value; OnPropertyChanged(); }
+		}
+
+		public bool ClsCompliant
+		{
+			get { return assemblyInfo.ClsCompliant; }
+			set { assemblyInfo.ClsCompliant = value; OnPropertyChanged(); }
+		}
+
+		public bool JitOptimization
+		{
+			get { return assemblyInfo.JitOptimization; }
+			set { assemblyInfo.JitOptimization = value; OnPropertyChanged(); }
+		}
+
+		public bool JitTracking
+		{
+			get { return assemblyInfo.JitTracking; }
+			set { assemblyInfo.JitTracking = value; OnPropertyChanged(); }
+		}
+	}
+}
\ No newline at end of file