diff --git a/common.mak b/common.mak
index 359032d3..69ac7efe 100644
--- a/common.mak
+++ b/common.mak
@@ -340,8 +340,6 @@ endif
 export INSTALL CFLAGS CXXFLAGS \
        LDFLAGS CPPFLAGS ALL_CFLAGS ALL_CXXFLAGS ALL_LDFLAGS ALL_CPPFLAGS
 
-NO_PIE_CFLAGS := -fno-pie
-
 # Overwrite implicit makefile rules for having nice compile output
 %.o: %.c
 ifeq ("${C}","1")
diff --git a/rust/pvimg/boot/Makefile b/rust/pvimg/boot/Makefile
index ad00371a..d6f30480 100644
--- a/rust/pvimg/boot/Makefile
+++ b/rust/pvimg/boot/Makefile
@@ -12,7 +12,7 @@ PVIMG_PKGDATADIR ?= $(TOOLS_DATADIR)/pvimg
 INCLUDE_PATHS := $(ZIPL_BOOT_DIR) $(ZIPL_DIR)/include $(rootdir)/include
 INCLUDE_PARMS := $(addprefix -I,$(INCLUDE_PATHS))
 
-ALL_CFLAGS := $(NO_PIE_CFLAGS) -Os -g \
+ALL_CFLAGS := -fno-pie -Os -g \
 	$(INCLUDE_PARMS) \
 	-DENABLE_SCLP_ASCII=1 \
 	-DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
diff --git a/zipl/boot/Makefile b/zipl/boot/Makefile
index 4ca0708a..61e00475 100644
--- a/zipl/boot/Makefile
+++ b/zipl/boot/Makefile
@@ -25,7 +25,7 @@ ifeq ($(HOST_ARCH),s390x)
 INCLUDE_PATHS := $(rootdir)/zipl/include $(rootdir)/include
 INCLUDE_PARMS := $(addprefix -I,$(INCLUDE_PATHS))
 
-ALL_CFLAGS = $(NO_PIE_CFLAGS) -Os -g $(INCLUDE_PARMS) \
+ALL_CFLAGS = -fno-pie -Os -g $(INCLUDE_PARMS) \
 	  -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE) \
 	  -fno-builtin -ffreestanding -fno-asynchronous-unwind-tables \
 	  -fno-delete-null-pointer-checks -fno-stack-protector \