diff --git a/ReleaseProcedure.txt b/ReleaseProcedure.txt
index c049561e04a..753cce5c66a 100644
--- a/ReleaseProcedure.txt
+++ b/ReleaseProcedure.txt
@@ -14,16 +14,20 @@ Tools\gitreleasemanager.0.7.0\tools\GitReleaseManager.exe create -o nhibernate -
     releasing another branch than master)
 
   * Update releasenotes.txt with the list of issues generated in the GitHub
-    draft release.
+    draft release. Add to the list the release task.
     See if any additions to the list of "known breaking changes" are necessary.
 
-  * Update the GitHub draft release for matching other release formalism: update
+  * Update the GitHub draft release for matching other release formalism: ensure
+    its tag matches the released version (three parts: major.minor.release), update
     its title, change its description for listing only highlights and breaking
     changes, include links to the milestone and the releasenotes of the release
     tag, include links to binaries on SourceForge and NuGet.
+    If the release tag does not match the released version with major.minor.release
+    formalism, the NuGet package will have an invalid link to release notes.
 
   * Check/update version number in common.xml and NHibernate.props under
-    build-common folder, and in master.xml under doc\reference folder.
+    build-common folder, in master.xml under doc\reference folder, and in
+    appveyor.yml in the NHibernate root.
 
   * Don't forget to commit the above.
 
diff --git a/appveyor.yml b/appveyor.yml
index 75728550da9..98414a33457 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 5.1.0.{build}
+version: 5.1.1.{build}
 image: Visual Studio 2017
 environment:
   matrix:
diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 9445d2d1e26..2310a3cafa7 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">1</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">0</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">1</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
diff --git a/build-common/common.xml b/build-common/common.xml
index 04994581ffa..539d14213ab 100644
--- a/build-common/common.xml
+++ b/build-common/common.xml
@@ -13,8 +13,8 @@
 
 	<!-- This is used only for build folder -->
 	<!-- TODO: Either remove or refactor to use NHibernate.props -->
-	<property name="project.version" value="5.1.0" overwrite="false" />
-	<property name="project.version.numeric" value="5.1.0" overwrite="false" />
+	<property name="project.version" value="5.1.1" overwrite="false" />
+	<property name="project.version.numeric" value="5.1.1" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />
diff --git a/releasenotes.txt b/releasenotes.txt
index cdfa5c7a326..28ead8fe1b3 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,4 +1,33 @@
-Build 5.1.0
+Build 5.1.1
+=============================
+
+Release notes - NHibernate - Version 5.1.1
+
+** Bug
+
+   * #1645 One-to-one with property-ref triggers StackOverflow Exception
+   * #1643 TypeLoadException in StaticProxyFactory after upgrading to 5.1.0
+   * #1640 Handle all overloads of String.Trim*()
+   * #1636 Fix api documentation assets path
+   * #1628 StackOverflowException for lazy proxied entities with explicit interface properties
+   * #1618 Fix NuGet push script
+   * #1149 NH-3391 - StatelessSession: one-to-one detail-object is always null
+
+** Improvement
+
+   * #1646 Add a link to release notes in NuGet package
+   * #1639 Speedup access to SQL Server on Linux
+   * #1624 Add missing ids on documentation sections
+   * #1619 Document "entity join" and "entity projection"
+
+** Task
+
+   * #1649 Release 5.1.1
+   * #1622 Update cache documentation
+   * #1621 Upgrade Async Generator to a version compatible with VS 15.6.3
+
+
+Build 5.1.0
 =============================
 
 Release notes - NHibernate - Version 5.1.0
diff --git a/src/NHibernate.sln b/src/NHibernate.sln
index d50878b114d..67d957ed5d6 100644
--- a/src/NHibernate.sln
+++ b/src/NHibernate.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -9,6 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\build-common\NHibernate.props = ..\build-common\NHibernate.props
 		..\releasenotes.txt = ..\releasenotes.txt
 		..\teamcity.build = ..\teamcity.build
+		..\build-common\common.xml = ..\build-common\common.xml
+		..\appveyor.yml = ..\appveyor.yml
+		..\ReleaseProcedure.txt = ..\ReleaseProcedure.txt
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHibernate", "NHibernate\NHibernate.csproj", "{5909BFE7-93CF-4E5F-BE22-6293368AF01D}"