diff --git a/.gitignore b/.gitignore
index 581c91d7..164a5c0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ Pipfile.lock
 *.kdbx.out
 .idea
 .venv*
+TMPNOTES
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 85ddfc5b..8cbaf0a0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,7 @@
 4.1.0 - 2024-06-26
 ------------------
-- merged PR#389 - add PyKeePass.database_name and database_description
-- merged PR#392, fixed #390 - fix pkg_resources dependency issue
+- merged #389 - add PyKeePass.database_name and database_description
+- merged #392, fixed #390 - fix pkg_resources dependency issue
 - fixed #391 - Entry.tags returns empty list instead of None
 - fixed #395 - set 'encoding' attribute when exporting as XML
 - fixed #383 - parse datetimes using isoformat instead of strptime
@@ -9,11 +9,11 @@
 4.0.7 - 2024-02-29
 ------------------
 - fixed #359 - PyKeePass has `decrypt` kwarg for accessing header info
-- merged PR#347 - added Entry.index and Entry.move for moving entries
-- merged PR#367 - added Entry.autotype_window setter
-- merged PR#364 - allow filename/keyfile to be file-like objects
-- merged PR#371 - drop dateutil dependency
-- merged PR#348 - switch to pyproject.toml
+- merged #347 - added Entry.index and Entry.move for moving entries
+- merged #367 - added Entry.autotype_window setter
+- merged #364 - allow filename/keyfile to be file-like objects
+- merged #371 - drop dateutil dependency
+- merged #348 - switch to pyproject.toml
 
 4.0.6 - 2023-08-22
 ------------------
diff --git a/Makefile b/Makefile
index c6b4ee69..a8d22b6b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@ release: lock dist
 		exit 1
 	fi
 	# generate release notes from changelog
-	awk "/---/{next}; /^$${stripped}/{next}; {print} ; /^$$/{exit}" CHANGELOG.rst > TMPNOTES
+	awk "BEGIN{p=0}; /^$${stripped}/{next}; /---/{p=1;next}; /^$$/{exit}; p {print}" CHANGELOG.rst > TMPNOTES
+	# make github and pypi release
 	gh release create --latest --verify-tag v$(version) dist/pykeepass-$(version)* -F TMPNOTES
 	twine upload -u __token__ dist/pykeepass-$(version)*