diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea6d1edec..3f9e44cb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,22 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [1.18.0] - 2024-05-07
+
+
+### Added
+
+- New in the API: Allow sources to delete their own incidents, as well as allow
+  superusers to delete any incident.
+  ([#804](https://github.com/Uninett/Argus/issues/804))
+
+### Changed
+
+- Allow replacing Incident.metadata with another json blob via API, no
+  questions asked, nothing to see here.
+  ([#807](https://github.com/Uninett/Argus/issues/807))
+
+
 ## [1.17.0] - 2024-05-03
 
 
diff --git a/NOTES.md b/NOTES.md
index 7ff3f5530..410331154 100644
--- a/NOTES.md
+++ b/NOTES.md
@@ -1,7 +1,22 @@
 # Release Notes
+
 This file documents changes to Argus that are relevant for operations and
 end-users.
 
+## [1.18.0] - 2024-05-07
+
+There's a new API endpoint allowing the deletion of an existing incident and
+its events. The new setting `INDELIBLE_INCIDENTS` controls this, the backwards
+compatible setting is `True`. Toggle to `False` to allow deletion. The plan
+forward is to limit deletion according to some rule we haven't decided on:
+
+* limit it to "new" incidents, for an unfinished definition of "new"
+* have an (optional) flag on incident controllable by the source
+* so.. many.. ideas, hence, running code now, hard decisions later.
+
+Smaller change: the data in Incident.metadata can now be replaced with HTTP
+PATCH/PUT, in line with `ticket_url`, `details_url` and `level`.
+
 ## [1.17.0] - 2024-05-03
 
 This release marks the start of The Great HTMx Experiment and a cooperation
diff --git a/changelog.d/+807.changed.md b/changelog.d/+807.changed.md
deleted file mode 100644
index 3be687c87..000000000
--- a/changelog.d/+807.changed.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Allow replacing Incident.metadata with another json blob via API, no questions
-asked, nothing to see here.
diff --git a/changelog.d/804.added.md b/changelog.d/804.added.md
deleted file mode 100644
index 84065ddb2..000000000
--- a/changelog.d/804.added.md
+++ /dev/null
@@ -1,2 +0,0 @@
-New in the API: Allow sources to delete their own incidents, as well as allow
-superusers to delete any incident.