--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
-CPPFLAGS := -I.
-CFLAGS := -g -Wall -Werror
+CPPFLAGS += -I.
+CFLAGS += -g -Wall -Werror
+# Libraries can't be compiled with -pie/-fPIE. Strip it from CFLAGS/LDFLAGS if
+# used.
+CFLAGS_LIB := $(filter-out -fPIE,$(CFLAGS))
+LDFLAGS_LIB := $(filter-out -fPIE,$(filter-out -pie,$(LDFLAGS)))
 INSTALL := install
 DESTDIR :=
 SPECFILE := keyutils.spec
@@ -129,10 +133,10 @@ $(SONAME): $(LIBNAME)
 LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds
 $(LIBNAME): keyutils.os version.lds Makefile
-	$(CC) $(CFLAGS) -fPIC $(LDFLAGS) $(LIBVERS) -o $@ keyutils.os $(LIBLIBS)
+	$(CC) $(CFLAGS_LIB) -fPIC $(LDFLAGS_LIB) $(LIBVERS) -o $@ keyutils.os $(LIBLIBS)
 
 keyutils.os: keyutils.c keyutils.h Makefile
-	$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
+	$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS_LIB) -fPIC -o $@ -c $<
