diff --git a/.goreleaser.yml b/.goreleaser.yml
index 12910f7c0eee5ade6a0bab1b36afd8f1b9b84981..227bc45ff5c3ac08a595c7b033974564e59e13fa 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -59,12 +59,12 @@ nfpms:
     contents:
       - src: server/server.yml
         dst: /etc/ntfy/server.yml
-        type: config
+        type: "config|noreplace"
       - src: server/ntfy.service
         dst: /lib/systemd/system/ntfy.service
       - src: client/client.yml
         dst: /etc/ntfy/client.yml
-        type: config
+        type: "config|noreplace"
       - src: client/ntfy-client.service
         dst: /lib/systemd/system/ntfy-client.service
       - dst: /var/cache/ntfy
diff --git a/docs/releases.md b/docs/releases.md
index 6ce95f30402c58e7ccfac9912cea3bba98e19db5..2de9302449ed27192c9dcf953f94f70b08d3b10b 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -2,12 +2,24 @@
 Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
 and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
 
+## ntfy server v1.18.0
+Released XXXXXXXXXXXXXXX
+
+**Bug fixes:**
+
+* rpm: do not overwrite server.yaml on package upgrade (#166, thanks @waclaw66 for reporting)
+
+**Deprecations:**
+
+* Removed the ability to run server as `ntfy serve` as per [deprecation](https://ntfy.sh/docs/deprecations)
+
 ## ntfy Android app v1.10.0
 Released XXXXXXXXXXXXXXX
 
 **Features:**
 
 * Support for UnifiedPush 2.0 specification (bytes messages, #130)
+* Export/import settings and subscriptions (#115, thanks @cmeis for reporting)
 
 **Bug fixes:**