diff --git a/README.md b/README.md
index f4e20f7..d5d7203 100644
--- a/README.md
+++ b/README.md
@@ -285,12 +285,17 @@ Use the provided build script:
 - SMTP username and password
 - SSL/TLS setting (default: yes)
 
-**⚠️ Password Limitation:**
-The build script uses a heredoc approach for credentials. This works for most passwords, including those with special characters like `#` (hash). However, passwords containing **both spaces AND quotes together** (e.g., `"pass word"`) may fail.
-
-If your password contains both spaces and quotes, consider:
-- Using a simpler password
-- Manually editing the build command
+**✅ Special Character Support:**
+The build script uses multiple `-ldflags` arguments to handle all special characters safely, including:
+- Spaces
+- Double quotes (`"`)
+- Hash signs (`#`)
+- Dollar signs (`$`)
+- At signs (`@`)
+- Exclamation marks (`!`)
+- Percentage signs (`%`)
+- Ampersands (`&`)
+- And any other special characters
 
 ---
 
diff --git a/build.sh b/build.sh
index bef443c..3d38b5d 100755
--- a/build.sh
+++ b/build.sh
@@ -106,24 +106,20 @@ echo "✓ nextcloud-calendar built successfully"
 echo "Building nextcloud-mail..."
 cd "$SCRIPT_DIR/tools/go/nextcloud-mail"
 
-# Build with compile-time credentials
-# Use heredoc to write ldflags to temp file - handles # character
-LDFLAGS_FILE="/tmp/nextcloud-mail-ldflags.$$"
-cat > "$LDFLAGS_FILE" <<LDFLAGSEOF
--X main.BuildIMAPServer=$IMAP_SERVER
--X main.BuildIMAPPort=$IMAP_PORT
--X main.BuildIMAPUser=$IMAP_USER
--X main.BuildIMAPPassword=$IMAP_PASS
--X main.BuildSMTPServer=$SMTP_SERVER
--X main.BuildSMTPPort=$SMTP_PORT
--X main.BuildSMTPUser=$SMTP_USER
--X main.BuildSMTPPassword=$SMTP_PASS
--X main.BuildUseSSL=$USE_SSL
--X main.BuildIgnoreCerts=$IGNORE_CERTS
-LDFLAGSEOF
-
-go build -ldflags="$(cat "$LDFLAGS_FILE")" -o ~/bin/nextcloud-mail .
-rm -f "$LDFLAGS_FILE"
+# Build with compile-time credentials using multiple -ldflags arguments
+# This approach handles ALL special characters: spaces, quotes, #, $, @, etc.
+go build \
+  -ldflags="-X main.BuildIMAPServer=$IMAP_SERVER" \
+  -ldflags="-X main.BuildIMAPPort=$IMAP_PORT" \
+  -ldflags="-X main.BuildIMAPUser=$IMAP_USER" \
+  -ldflags="-X main.BuildIMAPPassword=$IMAP_PASS" \
+  -ldflags="-X main.BuildSMTPServer=$SMTP_SERVER" \
+  -ldflags="-X main.BuildSMTPPort=$SMTP_PORT" \
+  -ldflags="-X main.BuildSMTPUser=$SMTP_USER" \
+  -ldflags="-X main.BuildSMTPPassword=$SMTP_PASS" \
+  -ldflags="-X main.BuildUseSSL=$USE_SSL" \
+  -ldflags="-X main.BuildIgnoreCerts=$IGNORE_CERTS" \
+  -o ~/bin/nextcloud-mail
 echo "✓ nextcloud-mail built successfully"
 
 echo ""