diff --git a/samples/PInvokeAddIn/PInvokeAddIn.sln b/samples/PInvokeAddIn/PInvokeAddIn.sln
index a176696c3b..d28df1f0f3 100644
--- a/samples/PInvokeAddIn/PInvokeAddIn.sln
+++ b/samples/PInvokeAddIn/PInvokeAddIn.sln
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.909
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+# SharpDevelop 4.3
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PInvokeAddIn", "Project\PInvokeAddIn.csproj", "{5EEB99CF-EA2B-4733-80A6-CE9192D68170}"
 EndProject
 Global
diff --git a/samples/PInvokeAddIn/Project/PInvoke.addin b/samples/PInvokeAddIn/Project/PInvoke.addin
index b4cdc1f07e..4c660d85b2 100644
--- a/samples/PInvokeAddIn/Project/PInvoke.addin
+++ b/samples/PInvokeAddIn/Project/PInvoke.addin
@@ -1,8 +1,7 @@
 <AddIn name        = "PInvoke Add-in"
        author      = "Matt Ward"
        copyright   = "prj:///doc/copyright.txt"
-       description = "PInvoke.Net integration for SharpDevelop."
-       addInManagerHidden = "preinstalled">
+       description = "PInvoke.Net integration for SharpDevelop.">
 	
 	<Manifest>
 		<Identity name = "ICSharpCode.PInvokeAddIn"/>
diff --git a/samples/PInvokeAddIn/Project/PInvoke.nuspec b/samples/PInvokeAddIn/Project/PInvoke.nuspec
new file mode 100644
index 0000000000..1331188962
--- /dev/null
+++ b/samples/PInvokeAddIn/Project/PInvoke.nuspec
@@ -0,0 +1,20 @@
+<?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>PInvoke</id>
+		<version>0.1</version>
+		<authors>Matt Ward</authors>
+		<owners>SharpDevelop</owners>
+		<requireLicenseAcceptance>false</requireLicenseAcceptance>
+		<description>PInvoke.Net integration for SharpDevelop.</description>
+		<summary>PInvoke.Net integration for SharpDevelop.</summary>
+		<releaseNotes></releaseNotes>
+		<language>en-US</language>
+		<tags>SharpDevelopAddIn</tags>
+  </metadata>
+	<files>
+		<file src="..\..\..\AddIns\Samples\PInvoke\PInvoke.addin" target="" />
+		<file src="..\..\..\AddIns\Samples\PInvoke\signatures.xml" target="" />
+		<file src="..\..\..\AddIns\Samples\PInvoke\PInvokeAddin.dll" target="" />
+	</files>
+</package>
\ No newline at end of file
diff --git a/samples/PInvokeAddIn/Project/PInvokeAddIn.csproj b/samples/PInvokeAddIn/Project/PInvokeAddIn.csproj
index 65ef014444..5943ff503e 100644
--- a/samples/PInvokeAddIn/Project/PInvokeAddIn.csproj
+++ b/samples/PInvokeAddIn/Project/PInvokeAddIn.csproj
@@ -16,17 +16,18 @@
     <BaseAddress>122159104</BaseAddress>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <FileAlignment>4096</FileAlignment>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NoWin32Manifest>False</NoWin32Manifest>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <Optimize>False</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\Misc\PInvokeAddIn\</OutputPath>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <DebugType>Full</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -34,19 +35,28 @@
     <Optimize>True</Optimize>
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
     <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <OutputPath>..\..\..\..\..\AddIns\Misc\PInvokeAddIn\</OutputPath>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DebugType>None</DebugType>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <Prefer32Bit>False</Prefer32Bit>
+    <OutputPath>..\..\..\AddIns\Samples\PInvoke</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.Core">
       <HintPath>..\..\..\bin\ICSharpCode.Core.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.NRefactory">
       <HintPath>..\..\..\bin\ICSharpCode.NRefactory.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="ICSharpCode.SharpDevelop">
       <HintPath>..\..\..\bin\ICSharpCode.SharpDevelop.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Forms" />
@@ -62,6 +72,7 @@
     <Compile Include="Src\PInvokeRepository.cs" />
     <Compile Include="Src\PInvokeCodeGenerator.cs" />
     <EmbeddedResource Include="Resources\InsertPInvokeSignaturesForm.xfrm" />
+    <None Include="PInvoke.nuspec" />
     <None Include="signatures.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>