diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46abc234c..a579e7659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1149,6 +1149,9 @@
 ## 8.6.1
 * Fix regression that caused encrypted messages to end up unencrypted when dead-lettered
 
+## 8.7.0
+* Add additional compile targets and bump System.Text.Json dependency to at least 8.0.5 because almost all the previous versions have weaknesses
+
 ---
 
 [AndreaCuneo]: https://github.com/AndreaCuneo
diff --git a/Rebus.Tests/Rebus.Tests.csproj b/Rebus.Tests/Rebus.Tests.csproj
index e5f72b5cb..b73478510 100644
--- a/Rebus.Tests/Rebus.Tests.csproj
+++ b/Rebus.Tests/Rebus.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Library</OutputType>
-		<TargetFrameworks>net8.0</TargetFrameworks>
-		<LangVersion>12</LangVersion>
+		<TargetFrameworks>net9.0</TargetFrameworks>
+		<LangVersion>13</LangVersion>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\ClassLibraryWithCustomName\ClassLibraryWithCustomName.csproj" />
@@ -11,7 +11,7 @@
 	<ItemGroup>
 		<PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
 		<PackageReference Include="AutoFixture.NUnit3" Version="4.18.1" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="NUnit" Version="3.14.0" />
 		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/Rebus/Rebus.csproj b/Rebus/Rebus.csproj
index 33f126bc7..e6fe03710 100644
--- a/Rebus/Rebus.csproj
+++ b/Rebus/Rebus.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Library</OutputType>
-		<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
-		<LangVersion>11</LangVersion>
+		<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+		<LangVersion>13</LangVersion>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<Authors>mookid8000</Authors>
 		<PackageProjectUrl>https://rebus.fm/what-is-rebus/</PackageProjectUrl>
@@ -27,7 +27,7 @@
 		<PackageReference Include="Newtonsoft.Json" Version="[13.0.1,14)" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-		<PackageReference Include="system.text.json" Version="[6,9)" />
+		<PackageReference Include="system.text.json" Version="[8.0.5,10)" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
 	</ItemGroup>
 	<ItemGroup>