diff --git a/podman.spec b/podman.spec
index 86ffc88..88428e7 100644
--- a/podman.spec
+++ b/podman.spec
@@ -11,7 +11,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 
 %global import_path github.com/containers/podman
 %global branch v4.0
-%global commit0 b0a445e3545d66ba449f2e3e81bde3a2c5db4896
+%global commit0 c4a9aa7c73e120fc2e246f056fec83ff35854dba
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 %global cataver 0.1.7
 #%%global dnsnamever 1.3.0
@@ -25,7 +25,7 @@ GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback $
 Epoch: 2
 Name: podman
 Version: 4.0.0
-Release: 0.29%{?dist}
+Release: 0.30%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0 and GPLv3+
 URL: https://%{name}.io/
@@ -228,7 +228,7 @@ export BUILDTAGS="remote $BUILDTAGS"
 %{__make} docs
 
 # build catatonit
-unset LDFLAGS
+LDFLAGS="%__global_ldflags"
 CFLAGS="%{optflags} -fPIE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 pushd catatonit-%{cataver}
 autoreconf -fi
@@ -257,7 +257,6 @@ export GOPATH=$(pwd)/_build:$(pwd)
 popd
 
 pushd %{name}-machine-cni-%{commit_mcni}
-unset LDFLAGS
 mkdir _build
 pushd _build
 mkdir -p src/github.com/containers
@@ -269,7 +268,6 @@ export GOPATH=$(pwd)/_build:$(pwd)
 popd
 
 pushd %{gvproxyrepo}-%{gvproxyver}
-unset LDFLAGS
 mkdir _build
 pushd _build
 mkdir -p src/github.com/containers
@@ -413,6 +411,10 @@ exit 0
 %{_libexecdir}/%{name}/gvproxy
 
 %changelog
+* Mon Feb 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.30
+- fix linker flags to assure -D_FORTIFY_SOURCE=2 is present at the command line
+- Related: #2000051
+
 * Mon Feb 14 2022 Jindrich Novy <jnovy@redhat.com> - 2:4.0.0-0.29
 - update to the latest content of https://github.com/containers/podman/tree/v4.0
   (https://github.com/containers/podman/commit/b0a445e)
diff --git a/sources b/sources
index c2e3b85..125e533 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@ SHA512 (v0.1.0.tar.gz) = 72d27e2a7c20f956a177bcda96508c1ec7b8ac0a512f9ab1a045bcf
 SHA512 (podman-machine-cni-0749884.tar.gz) = fe5f6a69118c0d3475c76c61bf1b50f1d5772fe9a4d20b23e59010e72f8cbd7fb7d4091ce8ab43af8becf77e5234b63191e3e01932f30f8386235822de2e42f4
 SHA512 (dnsname-18822f9.tar.gz) = de371722fbf18cd23b31485ee7ba36bb41d0d9a932d15e50872989c3ca1ff7246da63143c3725d81089fadda3821a54c18b22150d9d16005b07df6824f5f71f8
 SHA512 (v0.1.7.tar.gz) = 7d3174c60e1c8bd1f4b95b7751ccbe01cac63265060f18914b53311f68f7b4c63c693604f348ccfac5db4a96939169f835fbbbd614803b18062053d94f7dca67
-SHA512 (v4.0-b0a445e.tar.gz) = cce507b3d4bc24930b1e27572da87ccc35c644c712877962e2779aaad5ff0427367d36a68182e578a6abad5e1d1480e0cdb04f2d812e3d6b4aeb4c3678f95dd7
+SHA512 (v4.0-c4a9aa7.tar.gz) = 31622b9a96291d4d57fe26ab8fdf66c9aa83bf861e2a064f35b9b93d91f8525af7dde301cad4c8cc466fb604b6c2cea03713bc3be949b8c68cfee0b522d1d504