diff --git a/.gitignore b/.gitignore
index fd23a9aaa4..5d9d573cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ bin/
 /src/Main/StartUp/Project/SharpDevelop.exe.config
 /src/Main/GlobalAssemblyInfo.cs
 /src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.cs
+
+/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib
\ No newline at end of file
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.4.0.0.7070.nupkg b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.4.1.0.8000.nupkg
similarity index 75%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.4.0.0.7070.nupkg
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.4.1.0.8000.nupkg
index 73e53d80a2..6e29f74289 100644
Binary files a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.4.0.0.7070.nupkg and b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.4.1.0.8000.nupkg differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.nuspec b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.nuspec
index 48fee777b5..e000423510 100644
--- a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.nuspec
+++ b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/AvalonEdit.Sample.nuspec
@@ -2,18 +2,26 @@
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <id>AvalonEdit.Sample</id>
-    <version>4.0.0.7070</version>
+    <version>4.1.0.8000</version>
     <authors>Daniel Grunwald</authors>
     <owners>SharpDevelop</owners>
     <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
     <projectUrl>http://www.avalonedit.net</projectUrl>
     <iconUrl>http://community.sharpdevelop.net/blogs/mattward/SharpDevelop.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>Sample code for AvalonEdit the WPF-based text editor used in SharpDevelop 4.0.</description>
+    <description>Sample code for AvalonEdit the WPF-based text editor used in SharpDevelop 4.0.
+Modify your App.xaml file so the StartupUri points to the AvalonEdit Sample window: 
+
+StartupUri="/Samples/AvalonEdit/Window1.xaml"</description>
     <summary>Sample code for AvalonEdit the WPF-based text editor used in SharpDevelop 4.0.</summary>
     <language>en-US</language>
     <dependencies>
-      <dependency id="AvalonEdit" version="4.0.0.7070" />
+      <dependency id="AvalonEdit" version="4.1.0.8000" />
     </dependencies>
+		<frameworkAssemblies>
+			<frameworkAssembly assemblyName="System.Windows.Forms" />
+			<frameworkAssembly assemblyName="WindowsFormsIntegration" />
+		</frameworkAssemblies>
+		<tags>WPF Text Editor SharpDevelop AvalonEdit</tags>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/BraceFoldingStrategy.cs.pp b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/BraceFoldingStrategy.cs.pp
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/BraceFoldingStrategy.cs.pp
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/BraceFoldingStrategy.cs.pp
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/ColorizeAvalonEdit.cs.pp b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/ColorizeAvalonEdit.cs.pp
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/ColorizeAvalonEdit.cs.pp
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/ColorizeAvalonEdit.cs.pp
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/CustomHighlighting.xshd b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/CustomHighlighting.xshd
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/CustomHighlighting.xshd
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/CustomHighlighting.xshd
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/ImageElementGenerator.cs.pp b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/ImageElementGenerator.cs.pp
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/ImageElementGenerator.cs.pp
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/ImageElementGenerator.cs.pp
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/MyCompletionData.cs.pp b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/MyCompletionData.cs.pp
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/MyCompletionData.cs.pp
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/MyCompletionData.cs.pp
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/Window1.xaml.cs.pp b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/Window1.xaml.cs.pp
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/Window1.xaml.cs.pp
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/Window1.xaml.cs.pp
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/Window1.xaml.pp b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/Window1.xaml.pp
similarity index 96%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/Window1.xaml.pp
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/Window1.xaml.pp
index 4af0b557ec..fc59677107 100644
--- a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/Window1.xaml.pp
+++ b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/Window1.xaml.pp
@@ -21,7 +21,8 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
-    xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
+	xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms"
+	TextOptions.TextFormattingMode="Display"
 	Title="AvalonEdit.Sample" Height="500" Width="700"
 	>
 	<DockPanel>
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/article.html b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/article.html
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/article.html
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/article.html
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/document.html b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/document.html
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/document.html
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/document.html
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/rendering.html b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/rendering.html
similarity index 100%
rename from src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/AvalonEdit.Sample/rendering.html
rename to src/AddIns/Misc/PackageManagement/Packages/AvalonEdit.Sample/Content/Samples/AvalonEdit/rendering.html
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.0.0.7070.nupkg b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.0.0.7070.nupkg
deleted file mode 100644
index e193f23d41..0000000000
Binary files a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.0.0.7070.nupkg and /dev/null differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.1.0.8000.nupkg b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.1.0.8000.nupkg
new file mode 100644
index 0000000000..2c307fee6c
Binary files /dev/null and b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.1.0.8000.nupkg differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.1.0.8000.symbols.nupkg b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.1.0.8000.symbols.nupkg
new file mode 100644
index 0000000000..f753371459
Binary files /dev/null and b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.4.1.0.8000.symbols.nupkg differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.nuspec b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.nuspec
index 52cd3aa14b..933dab9b9d 100644
--- a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.nuspec
+++ b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/AvalonEdit.nuspec
@@ -1,18 +1,25 @@
 <?xml version="1.0"?>
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>AvalonEdit</id>
-    <version>4.0.0.7070</version>
-    <authors>Daniel Grunwald</authors>
-    <owners>SharpDevelop</owners>
-    <licenseUrl>http://www.opensource.org/licenses/lgpl-2.1.php</licenseUrl>
-    <projectUrl>http://www.avalonedit.net</projectUrl>
-    <iconUrl>http://community.sharpdevelop.net/blogs/mattward/SharpDevelop.png</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>AvalonEdit is the WPF-based text editor used in SharpDevelop 4.0. 
-    There are two builds of AvalonEdit included in this package. One that targets .NET 4.0 and 
-    one that targets .NET 3.5.</description>
-    <summary>AvalonEdit is the WPF-based text editor used in SharpDevelop 4.0.</summary>
-    <language>en-US</language>
+	<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+		<id>AvalonEdit</id>
+		<version>4.1.0.8000</version>
+		<authors>Daniel Grunwald</authors>
+		<owners>SharpDevelop</owners>
+		<licenseUrl>http://www.opensource.org/licenses/lgpl-2.1.php</licenseUrl>
+		<projectUrl>http://www.avalonedit.net</projectUrl>
+		<iconUrl>http://community.sharpdevelop.net/blogs/mattward/SharpDevelop.png</iconUrl>
+		<requireLicenseAcceptance>true</requireLicenseAcceptance>
+		<description>AvalonEdit is the WPF-based text editor used in SharpDevelop. There are two builds of AvalonEdit included in this package. One that targets .NET 4.0 and  one that targets .NET 3.5.</description>
+		<summary>AvalonEdit is the WPF-based text editor used in SharpDevelop</summary>
+		<releaseNotes>Improved WPF text rendering performance.
+Region tooltips added. 
+C# syntax highlighting: Do not colorize punctuation.</releaseNotes>
+		<language>en-US</language>
+		<tags>WPF Text Editor SharpDevelop AvalonEdit</tags>
   </metadata>
+	<files>
+		<file src="lib\Net35\*.*" target="lib\Net35" />
+		<file src="lib\Net40\*.*" target="lib\Net40" />
+		<file src="..\..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\**\*.cs" target="src" />
+	</files>
 </package>
\ No newline at end of file
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib/Net35/ICSharpCode.AvalonEdit.dll b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib/Net35/ICSharpCode.AvalonEdit.dll
deleted file mode 100644
index 7fe9b7d76e..0000000000
Binary files a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib/Net35/ICSharpCode.AvalonEdit.dll and /dev/null differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib/Net40/ICSharpCode.AvalonEdit.dll b/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib/Net40/ICSharpCode.AvalonEdit.dll
deleted file mode 100644
index c5b592b48a..0000000000
Binary files a/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib/Net40/ICSharpCode.AvalonEdit.dll and /dev/null differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/NuGet.exe b/src/AddIns/Misc/PackageManagement/Packages/NuGet.exe
index dabb7ca654..c3960af621 100644
Binary files a/src/AddIns/Misc/PackageManagement/Packages/NuGet.exe and b/src/AddIns/Misc/PackageManagement/Packages/NuGet.exe differ
diff --git a/src/AddIns/Misc/PackageManagement/Packages/buildpackages.cmd b/src/AddIns/Misc/PackageManagement/Packages/buildpackages.cmd
index fdb7d78cbf..7e40864638 100644
--- a/src/AddIns/Misc/PackageManagement/Packages/buildpackages.cmd
+++ b/src/AddIns/Misc/PackageManagement/Packages/buildpackages.cmd
@@ -1,4 +1,21 @@
-nuget.exe pack AvalonEdit\AvalonEdit.nuspec -b AvalonEdit -o AvalonEdit
-nuget.exe pack AvalonEdit.Sample\AvalonEdit.Sample.nuspec -b AvalonEdit.Sample -o AvalonEdit.Sample
-nuget.exe pack ICSharpCode.TextEditor\ICSharpCode.TextEditor.nuspec -b ICSharpCode.TextEditor -o ICSharpCode.TextEditor
-nuget.exe pack ICSharpCode.TextEditor.Sample\ICSharpCode.TextEditor.Sample.nuspec -b ICSharpCode.TextEditor.Sample -o ICSharpCode.TextEditor.Sample
\ No newline at end of file
+@ECHO OFF
+SETLOCAL
+SET msbuild=%windir%\microsoft.net\framework\v4.0.30319\msbuild
+SET project=..\..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj
+SET buildoptions=/t:Rebuild /p:Configuration=Release /p:DebugType=PdbOnly
+
+@ECHO ON
+:Clean debug build
+%msbuild% /m %project% /t:Clean /p:Configuration=Debug /p:OutputPath=%~dp0\AvalonEdit\lib\Net40
+
+:BUILD .NET 4.0 version
+%msbuild% /m %project% %buildoptions% /p:OutputPath=%~dp0\AvalonEdit\lib\Net40
+
+:BUILD .NET 3.5 version
+%msbuild% /m %project% %buildoptions% "/p:DefineConstants=TRACE" "/p:TargetFrameworkVersion=v3.5" /p:OutputPath=%~dp0\AvalonEdit\lib\Net35
+
+nuget.exe pack AvalonEdit\AvalonEdit.nuspec -Symbols -BasePath AvalonEdit -OutputDirectory AvalonEdit
+nuget.exe pack AvalonEdit.Sample\AvalonEdit.Sample.nuspec -BasePath AvalonEdit.Sample -OutputDirectory AvalonEdit.Sample
+
+@ECHO OFF
+ENDLOCAL
\ No newline at end of file