diff --git a/.cargo/config.toml b/.cargo/config.toml
index 20a2a929b9..c71d491303 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -4,11 +4,13 @@
 rustdocflags = ["-Arustdoc::private_intra_doc_links"]
 
 # Enable frame pointers. This may have a minor performance overhead, but makes it easier and more
-# efficient to obtain stack traces (and thus CPU/heap profiles). With continuous profiling, this is
-# likely a net win, and allows higher profiling resolution. See also:
+# efficient to obtain stack traces (and thus CPU/heap profiles). It may also avoid seg faults that
+# we've seen with libunwind-based profiling. See also:
 #
 # * <https://www.brendangregg.com/blog/2024-03-17/the-return-of-the-frame-pointers.html>
 # * <https://github.com/rust-lang/rust/pull/122646>
+#
+# NB: the RUSTFLAGS envvar will replace this. Make sure to update e.g. Dockerfile as well.
 rustflags = ["-Cforce-frame-pointers=yes"]
 
 [alias]
diff --git a/Dockerfile b/Dockerfile
index df9bcb3002..2c157b3b2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,7 @@ COPY --chown=nonroot . .
 
 ARG ADDITIONAL_RUSTFLAGS
 RUN set -e \
-    && PQ_LIB_DIR=$(pwd)/pg_install/v${STABLE_PG_VERSION}/lib RUSTFLAGS="-Clinker=clang -Clink-arg=-fuse-ld=mold -Clink-arg=-Wl,--no-rosegment ${ADDITIONAL_RUSTFLAGS}" cargo build \
+    && PQ_LIB_DIR=$(pwd)/pg_install/v${STABLE_PG_VERSION}/lib RUSTFLAGS="-Clinker=clang -Clink-arg=-fuse-ld=mold -Clink-arg=-Wl,--no-rosegment -Cforce-frame-pointers=yes ${ADDITIONAL_RUSTFLAGS}" cargo build \
       --bin pg_sni_router  \
       --bin pageserver  \
       --bin pagectl  \