diff --git a/CHANGELOG.md b/CHANGELOG.md
index 042da75..8318e19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Start tracking changes for the next release (from 2026-01-23).
 
+### Fixed
+
+- Build: preserve existing `CGO_CFLAGS` when adding GCC 15+ workaround. (#8 — thanks @ramarivera)
+
 ## 0.1.0 - 2026-01-01
 
 ### Added
diff --git a/package.json b/package.json
index b1037a0..85bd633 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "packageManager": "pnpm@10.23.0",
   "scripts": {
     "wacli": "bash -lc 'pnpm -s build >/dev/null && exec ./dist/wacli \"$@\"' _",
-    "build": "mkdir -p dist && CGO_CFLAGS='-Wno-error=missing-braces' go build -tags sqlite_fts5 -o dist/wacli ./cmd/wacli",
+    "build": "mkdir -p dist && CGO_CFLAGS=\"${CGO_CFLAGS:+$CGO_CFLAGS }-Wno-error=missing-braces\" go build -tags sqlite_fts5 -o dist/wacli ./cmd/wacli",
     "start": "pnpm -s build && ./dist/wacli",
     "test": "pnpm -s test:go && pnpm -s test:fts",
     "test:go": "go test ./...",