diff --git a/MonoDevelop.AddinMaker.Tests/MonoDevelop.AddinMaker.Tests.csproj b/MonoDevelop.AddinMaker.Tests/MonoDevelop.AddinMaker.Tests.csproj
index ab7812042..6b7348655 100644
--- a/MonoDevelop.AddinMaker.Tests/MonoDevelop.AddinMaker.Tests.csproj
+++ b/MonoDevelop.AddinMaker.Tests/MonoDevelop.AddinMaker.Tests.csproj
@@ -8,7 +8,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MonoDevelop.AddinMaker.Tests</RootNamespace>
     <AssemblyName>MonoDevelop.AddinMaker.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <IsAddin>False</IsAddin>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/MonoDevelop.AddinMaker/MonoDevelop.AddinMaker.csproj b/MonoDevelop.AddinMaker/MonoDevelop.AddinMaker.csproj
index 0d9dfb8ab..c3edaaeef 100644
--- a/MonoDevelop.AddinMaker/MonoDevelop.AddinMaker.csproj
+++ b/MonoDevelop.AddinMaker/MonoDevelop.AddinMaker.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MonoDevelop.AddinMaker</RootNamespace>
     <AssemblyName>MonoDevelop.AddinMaker</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
diff --git a/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.props b/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.props
index 3cc2c0bfb..7665a28ae 100644
--- a/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.props
+++ b/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.props
@@ -1,5 +1,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<PropertyGroup>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-</PropertyGroup>
-</Project>
\ No newline at end of file
+  <!-- TODO can we determine this from the target MD instance early enough for the project system to use it? -->
+  <PropertyGroup>
+    <_AddinMakerFramework>v4.6.1</_AddinMakerFramework>
+    <TargetFrameworkVersion>$(_AddinMakerFramework)</TargetFrameworkVersion>
+  </PropertyGroup>
+</Project>
diff --git a/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.targets b/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.targets
index 53db63806..f122e4c52 100644
--- a/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.targets
+++ b/MonoDevelop.Addins.Tasks/MonoDevelop.Addins.targets
@@ -74,6 +74,8 @@
     <Message Text = "MDAddinsDir:   $(MDAddinsDir)" />
     <Message Text = "MDBinDir:      $(MDBinDir)" />
 
+    <Error Text = "Please remove TargetFrameworkVersion from your project file" Condition="'$(_AddinMakerFramework)'!='$(TargetFrameworkVersion)'"/>
+
     <PropertyGroup>
       <MDToolExe Condition="Exists('$(MDBinDir)\vstool.exe')">$(MDBinDir)\vstool.exe</MDToolExe>
       <MDToolExe Condition="'$(MDToolExe)'==''">$(MDBinDir)\mdtool.exe</MDToolExe>