diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props
index 75b3475d442..ce7a53ef53a 100644
--- a/build-common/NHibernate.props
+++ b/build-common/NHibernate.props
@@ -5,7 +5,7 @@
     <NhVersion     Condition="'$(NhVersion)' == ''"    >5.4</NhVersion>
     <VersionPatch  Condition="'$(VersionPatch)'  == ''">1</VersionPatch>
     <!-- Clear VersionSuffix for making release and set it to dev for making development builds -->
-    <VersionSuffix Condition="'$(VersionSuffix)' == ''">dev</VersionSuffix>
+    <VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
     <LangVersion Condition="'$(MSBuildProjectExtension)' != '.vbproj'">9.0</LangVersion>
 
     <VersionPrefix Condition="'$(VersionPrefix)' == ''">$(NhVersion).$(VersionPatch)</VersionPrefix>
diff --git a/releasenotes.txt b/releasenotes.txt
index f13a62621a9..420c05ea2ff 100644
--- a/releasenotes.txt
+++ b/releasenotes.txt
@@ -1,4 +1,25 @@
-Build 5.4.0
+Build 5.4.1
+=============================
+
+Release notes - NHibernate - Version 5.4.1
+
+4 issues were resolved in this release.
+
+** Bug
+
+   * #3216 Enable one-to-one optimistic lock handling in mapping
+   * #3215 Count(Distinct ...) does not work
+   * #3203 Fix a wrong example in configuration documentation
+
+** Task
+
+   * #3232 Release 5.4.1
+
+As part of releasing 5.4.1, a missing 5.4.0 possible breaking change has been added, about
+one-to-one associations and optimistic locking. See 5.4.0 possible breaking changes.
+
+
+Build 5.4.0
 =============================
 
 Release notes - NHibernate - Version 5.4.0
@@ -12,6 +33,8 @@ Release notes - NHibernate - Version 5.4.0
     * 201 issues were resolved in this release.
 
     ##### Possible Breaking Changes #####
+        * One-to-one changes does now trigger a version increment, consistently with the default behavior of other kinds of
+          associations. See #3204.
         * Linq and criteria queries on unmapped entities will throw instead of returning an empty result list. See #1106, #1095.
         * The second level cache UpdateTimestampsCache does not use locks anymore. This may slightly increase the number of cases
           where stale data is returned by the query cache. See #2742.