diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6071c8e3..1d8c7ec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. This projec
 If you are upgrading from v0.16.x, replace the binary (or run `docker pull`). If you are upgrading from v0.15.x and below, please read the [upgrading documentation](https://github.com/stalwartlabs/stalwart/blob/main/UPGRADING/v0_16.md) for more information on how to upgrade from previous versions.
 
 ## Added
-- FreeBSD support (x86_64 only for now): release binaries, installer support with rc.d service, and hier(7)-compliant default paths (`/usr/local/etc/stalwart`, `/var/db/stalwart`).
+- FreeBSD support.
 
 ## Changed
 
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index 6aef8865..38f23e9b 100644
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 build = "build.rs"
 
diff --git a/crates/coordinator/Cargo.toml b/crates/coordinator/Cargo.toml
index bf7b149f..1d01b77c 100644
--- a/crates/coordinator/Cargo.toml
+++ b/crates/coordinator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "coordinator"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/dav-proto/Cargo.toml b/crates/dav-proto/Cargo.toml
index 7b14fef3..3c284363 100644
--- a/crates/dav-proto/Cargo.toml
+++ b/crates/dav-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dav-proto"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/dav/Cargo.toml b/crates/dav/Cargo.toml
index 218a877c..eb184023 100644
--- a/crates/dav/Cargo.toml
+++ b/crates/dav/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dav"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/directory/Cargo.toml b/crates/directory/Cargo.toml
index 693e390e..879f55a8 100644
--- a/crates/directory/Cargo.toml
+++ b/crates/directory/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "directory"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/email/Cargo.toml b/crates/email/Cargo.toml
index 4f33e6f5..695fcd4a 100644
--- a/crates/email/Cargo.toml
+++ b/crates/email/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "email"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
@@ -35,6 +35,7 @@ sequoia-openpgp = { version = "2.0", default-features = false, features = ["cryp
 hashify = "0.2"
 rkyv = { version = "0.8.10", features = ["little_endian"] }
 compact_str = "0.9.0"
+tinyvec = { version = "1.10.0", features = ["alloc"] }
 
 [features]
 test_mode = []
diff --git a/crates/groupware/Cargo.toml b/crates/groupware/Cargo.toml
index 6db3480c..3d758435 100644
--- a/crates/groupware/Cargo.toml
+++ b/crates/groupware/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "groupware"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/http-proto/Cargo.toml b/crates/http-proto/Cargo.toml
index a0bf8a06..f6b3f5d4 100644
--- a/crates/http-proto/Cargo.toml
+++ b/crates/http-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "http_proto"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml
index 35af0dc3..8a091637 100644
--- a/crates/http/Cargo.toml
+++ b/crates/http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "http"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/imap-proto/Cargo.toml b/crates/imap-proto/Cargo.toml
index 93da1681..08db9971 100644
--- a/crates/imap-proto/Cargo.toml
+++ b/crates/imap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap_proto"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/imap/Cargo.toml b/crates/imap/Cargo.toml
index c21aa064..b7d2c2ec 100644
--- a/crates/imap/Cargo.toml
+++ b/crates/imap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/jmap-proto/Cargo.toml b/crates/jmap-proto/Cargo.toml
index e0ea9383..c68dda1a 100644
--- a/crates/jmap-proto/Cargo.toml
+++ b/crates/jmap-proto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap_proto"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/jmap/Cargo.toml b/crates/jmap/Cargo.toml
index 1f000bec..327fa8ce 100644
--- a/crates/jmap/Cargo.toml
+++ b/crates/jmap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jmap"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml
index 65b4ad89..33706d2d 100644
--- a/crates/main/Cargo.toml
+++ b/crates/main/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art"
 keywords = ["imap", "jmap", "smtp", "email", "mail", "webdav", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [[bin]]
diff --git a/crates/managesieve/Cargo.toml b/crates/managesieve/Cargo.toml
index 43d62b89..26bef5cc 100644
--- a/crates/managesieve/Cargo.toml
+++ b/crates/managesieve/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "managesieve"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/migration/Cargo.toml b/crates/migration/Cargo.toml
index cc6f16a8..1bf850c7 100644
--- a/crates/migration/Cargo.toml
+++ b/crates/migration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "migration"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/nlp/Cargo.toml b/crates/nlp/Cargo.toml
index c6d96d98..c4e73f7e 100644
--- a/crates/nlp/Cargo.toml
+++ b/crates/nlp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nlp"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/pop3/Cargo.toml b/crates/pop3/Cargo.toml
index e8ac5998..e7f38b52 100644
--- a/crates/pop3/Cargo.toml
+++ b/crates/pop3/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pop3"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/registry/Cargo.toml b/crates/registry/Cargo.toml
index 2cbfae8c..63990751 100644
--- a/crates/registry/Cargo.toml
+++ b/crates/registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "registry"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/services/Cargo.toml b/crates/services/Cargo.toml
index 93b32749..538aac15 100644
--- a/crates/services/Cargo.toml
+++ b/crates/services/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "services"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/smtp/Cargo.toml b/crates/smtp/Cargo.toml
index 34ff326d..6f47dcd3 100644
--- a/crates/smtp/Cargo.toml
+++ b/crates/smtp/Cargo.toml
@@ -7,7 +7,7 @@ homepage = "https://stalw.art/smtp"
 keywords = ["smtp", "email", "mail", "server"]
 categories = ["email"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/spam-filter/Cargo.toml b/crates/spam-filter/Cargo.toml
index 208213f2..5be78901 100644
--- a/crates/spam-filter/Cargo.toml
+++ b/crates/spam-filter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spam-filter"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/store/Cargo.toml b/crates/store/Cargo.toml
index c4fc36b1..12aa0e8a 100644
--- a/crates/store/Cargo.toml
+++ b/crates/store/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "store"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/trc/Cargo.toml b/crates/trc/Cargo.toml
index ca271c39..b3dd289a 100644
--- a/crates/trc/Cargo.toml
+++ b/crates/trc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "trc"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/trc/event-macro/Cargo.toml b/crates/trc/event-macro/Cargo.toml
index da44d1c6..bcd35e9f 100644
--- a/crates/trc/event-macro/Cargo.toml
+++ b/crates/trc/event-macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "event_macro"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [lib]
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index b5a5ba6b..35250413 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "types"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml
index ff6b2539..13f74b83 100644
--- a/crates/utils/Cargo.toml
+++ b/crates/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "utils"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [dependencies]
diff --git a/crates/utils/proc-macros/Cargo.toml b/crates/utils/proc-macros/Cargo.toml
index 3077e42a..7de66039 100644
--- a/crates/utils/proc-macros/Cargo.toml
+++ b/crates/utils/proc-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc_macros"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [lib]
diff --git a/install.sh b/install.sh
index a270b7b0..d137b456 100644
--- a/install.sh
+++ b/install.sh
@@ -199,15 +199,10 @@ Options:
 
 With no PREFIX, Stalwart is installed under standard FHS paths:
   binary   /usr/local/bin/stalwart
-  config   /etc/stalwart/config.json      (created by the daemon on first run)
-  env      /etc/stalwart/stalwart.env
+  config   /etc/stalwart/config.json      (/usr/local/etc/stalwart/config.json on FreeBSD)
+  env      /etc/stalwart/stalwart.env     (/usr/local/etc/stalwart/stalwart.env on FreeBSD)
   logs     /var/log/stalwart/
-  data     /var/lib/stalwart/
-
-On FreeBSD, config and data follow hier(7) instead:
-  config   /usr/local/etc/stalwart/config.json
-  env      /usr/local/etc/stalwart/stalwart.env
-  data     /var/db/stalwart/
+  data     /var/lib/stalwart/             (/var/db/stalwart on FreeBSD)
 
 When PREFIX is provided, a self-contained layout is used instead:
   binary   $PREFIX/bin/stalwart
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 12490a7a..5b883d9a 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tests"
-version = "0.16.12"
+version = "0.16.13"
 edition = "2024"
 
 [features]