diff --git a/README.md b/README.md
index 3ac96baf9..e1f43ddaf 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ dotnet add package FluentNHibernate
 
 * Read the [introduction](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started).
 * Get latest version from NuGet
-    - [.NETCore2.0, NETStandard2.0 or NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
+    - [.NET 6.0, .NET 8.0, NETStandard2.0 or NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
     - [.NET 4.0 with NHibernate 4.x](https://www.nuget.org/packages/FluentNHibernate/2.0.3)
     - [.NET 3.5 with NHibernate 3 if you like it vintage](https://www.nuget.org/packages/FluentNHibernate.Net35)
 
diff --git a/build.cake b/build.cake
index b45c041be..313216976 100644
--- a/build.cake
+++ b/build.cake
@@ -120,8 +120,15 @@ Task("Copy-Files")
             msBuildSettings
         );
         PublishProjects(
-            SrcProjects, "netcoreapp2.0",
-            parameters.Paths.Directories.ArtifactsBinNetCoreApp2.FullPath, 
+            SrcProjects, "net6.0",
+            parameters.Paths.Directories.ArtifactsBinNet60.FullPath, 
+            parameters.Version.DotNetAsterix, 
+            parameters.Configuration, 
+            msBuildSettings
+        );
+        PublishProjects(
+            SrcProjects, "net8.0",
+            parameters.Paths.Directories.ArtifactsBinNet80.FullPath, 
             parameters.Version.DotNetAsterix, 
             parameters.Configuration, 
             msBuildSettings
diff --git a/build/paths.cake b/build/paths.cake
index 79f8f0dea..ab065a0bc 100644
--- a/build/paths.cake
+++ b/build/paths.cake
@@ -25,7 +25,8 @@ public class BuildPaths
         var artifactsBinDir = artifactsDir.Combine("bin");
         var artifactsBinFullFx = artifactsBinDir.Combine("net461");        
         var artifactsBinNetStandard20 = artifactsBinDir.Combine("netstandard2.0");        
-        var artifactsBinNetCoreapp2 = artifactsBinDir.Combine("netcoreapp2.0");        
+        var artifactsBinNet60 = artifactsBinDir.Combine("netstandard6.0");        
+        var artifactsBinNet80 = artifactsBinDir.Combine("netstandard8.0");        
         var testResultsDir = artifactsDir.Combine("test-results");
         var nugetRoot = artifactsDir.Combine("nuget");
         
@@ -39,7 +40,8 @@ public class BuildPaths
             artifactsBinDir,
             artifactsBinFullFx,
             artifactsBinNetStandard20,
-            artifactsBinNetCoreapp2);
+            artifactsBinNet60,
+            artifactsBinNet80);
 
         // Files
         var buildFiles = new BuildFiles(
@@ -74,7 +76,8 @@ public class BuildDirectories
     public DirectoryPath ArtifactsBin { get; private set; }
     public DirectoryPath ArtifactsBinFullFx { get; private set; }    
     public DirectoryPath ArtifactsBinNetStandard20 { get; private set; }    
-    public DirectoryPath ArtifactsBinNetCoreApp2 { get; private set; }    
+    public DirectoryPath ArtifactsBinNet60 { get; private set; }    
+    public DirectoryPath ArtifactsBinNet80 { get; private set; }    
     public ICollection<DirectoryPath> ToClean { get; private set; }
 
     public BuildDirectories(        
@@ -84,7 +87,8 @@ public class BuildDirectories
         DirectoryPath artifactsBinDir,
         DirectoryPath artifactsBinFullFx,
         DirectoryPath artifactsBinNetStandard20,
-        DirectoryPath artifactsBinNetCoreapp2
+        DirectoryPath artifactsNet60,
+        DirectoryPath artifactsNet80
         )
     {
         Artifacts = artifactsDir;
@@ -93,7 +97,9 @@ public class BuildDirectories
         ArtifactsBin = artifactsBinDir;
         ArtifactsBinFullFx = artifactsBinFullFx;        
         ArtifactsBinNetStandard20 = artifactsBinNetStandard20;
-        ArtifactsBinNetCoreApp2 = artifactsBinNetCoreapp2;
+        ArtifactsBinNet60 = artifactsNet60;
+        ArtifactsBinNet80 = artifactsNet80;
+
         ToClean = new[] {
             Artifacts,
             TestResults,
diff --git a/src/FluentNHibernate/FluentNHibernate.csproj b/src/FluentNHibernate/FluentNHibernate.csproj
index 49cc6df88..8d20cdce4 100644
--- a/src/FluentNHibernate/FluentNHibernate.csproj
+++ b/src/FluentNHibernate/FluentNHibernate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461;net6.0;net8.0</TargetFrameworks>
     <PlatformTarget>AnyCpu</PlatformTarget>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -10,10 +10,6 @@
     <AssemblyOriginatorKeyFile>../FluentKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <RuntimeFrameworkVersion>2.0.9</RuntimeFrameworkVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="NHibernate" Version="5.3.3" />
   </ItemGroup>