diff --git a/.gitignore b/.gitignore
index c9f53a7..d80edd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /weldr-client-35.2.tar.gz.asc
 /weldr-client-35.3.tar.gz
 /weldr-client-35.3.tar.gz.asc
+/weldr-client-35.4.tar.gz
+/weldr-client-35.4.tar.gz.asc
diff --git a/sources b/sources
index d76c351..305a6bb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.3.tar.gz) = 1f2a79598dbd6d757a3c5ed26434f945659e0ee047a6f241f032325e19688f9722cbbb7e968e0858aa6d276b6d0013ef551b2957fda7b3f68c521a05e9e45ad7
-SHA512 (weldr-client-35.3.tar.gz.asc) = 257c806de93fe83e2bb305af97dd1e3676b83916b67cb5ce7d9ba7131084226bbfa0900ca6647464be6ad88ec2554561b86c4acab01f64b20e6ec61591b08747
+SHA512 (weldr-client-35.4.tar.gz) = aa60fac82cf146e0780c11034b22c22b997641a8e9135cb96c5e6bf874bee96b68376845557969a1e93a43e3b8552066f9738b96e05e31947c673a27e7ce2c5e
+SHA512 (weldr-client-35.4.tar.gz.asc) = 718dd5c9693bf47da2856977f3b8bfe3c39ec5824a700791af5ddf926ddc4145e060215e34067bfd19338552051117722dd1dfa62713c17c65d7474e20bdc041
 SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
diff --git a/weldr-client.spec b/weldr-client.spec
index 0e6f25f..f1e7306 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,7 +6,7 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.3
+Version:   35.4
 Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
@@ -83,8 +83,8 @@ export BUILDTAGS="integration"
 # On Fedora, also turn off go modules and set the path to the one into which
 # the golang-* packages install source code.
 %if 0%{?rhel}
-export LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
-go test -c -tags=integration -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
+export LDFLAGS="${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
+go test -c -tags=integration -buildmode pie -compiler gc -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
 %else
 make GOBUILDFLAGS="%{gobuildflags}" integration
 %endif
@@ -131,44 +131,8 @@ composer-cli package.
 
 
 %changelog
-* Mon Oct 04 2021 Brian C. Lane <bcl@redhat.com> - 35.3-1
-- New release: 35.3 (bcl)
-- spec: Adjust build methods for RHEL 8 (bcl)
-- github: Run build-in-podman to test building package (bcl)
-- spec: Use v2 module (bcl)
-- Makefile: Use v2 module (bcl)
-- Makefile: Add a build-in-podman target (bcl)
-- tests: Add JSON and error result testing to status (bcl)
-- tests: Add JSON and error result testing to sources (bcl)
-- tests: Add JSON and error result testing to projects (bcl)
-- tests: Add JSON and error result testing to modules (bcl)
-- tests: Add JSON and error result testing to distros (bcl)
-- tests: Add JSON and error result testing to compose (bcl)
-- tests: Add JSON and error result testing to blueprints (bcl)
-- test: Fix test client setup and output capture code (bcl)
-- test: Close output capture in printwrap_test (bcl)
-- test: reset the root flags on every ExecuteTest call (bcl)
-- status: Use ExecutionErrors for API errors (bcl)
-- sources: Use ExecutionErrors for API errors (bcl)
-- projects: Use ExecutionErrors for API errors (bcl)
-- modules: Use ExecutionErrors for API errors (bcl)
-- distros: Use ExecutionErrors for API errors (bcl)
-- compose: Use ExecutionErrors for API errors (bcl)
-- blueprints: Use ExecutionErrors for API errors (bcl)
-- composer-cli: Turn off normal command Stdout when --json is used (bcl)
-- weldr: Fix Stringer interface on API messages (bcl)
-- weldr: Clean up error message return code (bcl)
-- weldr: Move Unmarshal error to error position (bcl)
-- root: Add a helper function to print a list of errors (bcl)
-- Use GetFilePath for ComposeImage (bcl)
-- Use GetFilePath for ComposeResults (bcl)
-- Use GetFilePath for ComposerMetadata (bcl)
-- Use GetFilePath for ComposeLogs (bcl)
-- weldr: Add GetFilePath to download a file to a path (bcl)
-- Creating v2 module for breaking API changes (bcl)
-- Makefile: Add update-mods target (bcl)
-- vendor: Update the modules and vendor directory (bcl)
-- Bump go version to 1.15 (bcl)
-- Limit dependabot to 1 PR (bcl)
-- Enable Dependabot service (atodorov)
-- tests: Fix integration tests (bcl)
\ No newline at end of file
+* Fri Oct 29 2021 Brian C. Lane <bcl@redhat.com> - 35.4-1
+- New release: 35.4 (bcl)
+- test: More detailed error for test compose failure (bcl)
+- weldr: Return a helpful error for socket problems (bcl)
+- spec: Add build flags to composer-cli-test build cmdline (bcl)
\ No newline at end of file