diff --git a/appveyor.yml b/appveyor.yml
index fc6cc7f385f..70765f4d445 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 5.2.3.{build}
+version: 5.2.4.{build}
 image: Visual Studio 2017
 environment:
   matrix:
diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index fb11d5fb3e2..9e59c2114bf 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <VersionMajor Condition="'$(VersionMajor)' == ''">5</VersionMajor>
     <VersionMinor Condition="'$(VersionMinor)' == ''">2</VersionMinor>
-    <VersionPatch Condition="'$(VersionPatch)' == ''">3</VersionPatch>
+    <VersionPatch Condition="'$(VersionPatch)' == ''">4</VersionPatch>
     <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
diff --git a/build-common/common.xml b/build-common/common.xml
index 55a44ccb74b..e4639447d98 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.2.3" overwrite="false" />
-	<property name="project.version.numeric" value="5.2.3" overwrite="false" />
+	<property name="project.version" value="5.2.4" overwrite="false" />
+	<property name="project.version.numeric" value="5.2.4" overwrite="false" />
 
 	<!-- properties used to connect to database for testing -->
 	<include buildfile="nhibernate-properties.xml" />
diff --git a/releasenotes.txt b/releasenotes.txt
index a187de571f9..4db8bb7aa9b 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,3 +1,29 @@
+Build 5.2.4
+=============================
+
+Release notes - NHibernate - Version 5.2.4
+
+3 issues were resolved in this release. The dialect change has the side effect of
+re-enabling a hack used by NHibernate.Spatial, allowing Spatial users to upgrade
+to NHibernate 5.2.x. See NHibernate.Spatial#104.
+
+    ##### Possible Breaking Changes #####
+        * Using DML on an entity collection was applying the changes without
+          filtering according to the entity. It will now throw a
+          NotSupportedException.
+
+** Bug
+
+   * #2020 Throw for DML on filter
+   * #2011 Use a statically resolved dialect when building the session factory
+
+** Task
+
+   * #2030 Release 5.2.4
+
+As part of releasing 5.2.4, a missing 5.2.0 possible breaking change has been added about
+property-ref on null values. See 5.2.0 possible breaking changes.
+
 Build 5.2.3
 =============================
 
@@ -74,6 +100,9 @@ Release notes - NHibernate - Version 5.2.0
           IDictionary is no more supported.
         * Querying a dynamic entity as a Hashtable instead of an IDictionary is no more
           supported.
+        * A collection mapped with a `property-ref` will no more support being accessed
+          when the referenced property is null. It will throw. Previously, the collection
+          was not throwing but was always loaded empty.
         * With PostgreSQL, a HQL query using the bitwise xor operator "^" or "bxor"
           was exponentiating the arguments instead. It will now correctly apply the xor
           operator. (# operator in PostgreSQL SQL.)