diff -up pegasus/src/Clients/cimauth/Makefile_orig pegasus/src/Clients/cimauth/Makefile
--- pegasus/src/Clients/cimauth/Makefile_orig	2011-05-17 15:03:15.822670486 +0200
+++ pegasus/src/Clients/cimauth/Makefile	2011-05-17 15:03:26.893426279 +0200
@@ -34,6 +34,8 @@ DIR = Clients/cimauth
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
diff -up pegasus/src/Clients/cimconfig/Makefile_orig pegasus/src/Clients/cimconfig/Makefile
--- pegasus/src/Clients/cimconfig/Makefile_orig	2011-05-17 15:01:19.759266385 +0200
+++ pegasus/src/Clients/cimconfig/Makefile	2011-05-17 15:01:37.629099999 +0200
@@ -34,6 +34,8 @@ DIR = Clients/cimconfig
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
diff -up pegasus/src/Clients/cimprovider/Makefile_orig pegasus/src/Clients/cimprovider/Makefile
--- pegasus/src/Clients/cimprovider/Makefile_orig	2011-05-17 15:01:55.278898872 +0200
+++ pegasus/src/Clients/cimprovider/Makefile	2011-05-17 15:02:09.021077534 +0200
@@ -34,6 +34,8 @@ DIR = Clients/cimprovider
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
diff -up pegasus/src/Clients/cimuser/Makefile_orig pegasus/src/Clients/cimuser/Makefile
--- pegasus/src/Clients/cimuser/Makefile_orig	2011-05-17 15:02:18.991658613 +0200
+++ pegasus/src/Clients/cimuser/Makefile	2011-05-17 15:02:38.476748769 +0200
@@ -34,6 +34,8 @@ DIR = Clients/cimuser
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegcliutils \
     pegclient \
diff -up pegasus/src/Clients/osinfo/Makefile_orig pegasus/src/Clients/osinfo/Makefile
--- pegasus/src/Clients/osinfo/Makefile_orig	2011-05-17 15:03:57.952350916 +0200
+++ pegasus/src/Clients/osinfo/Makefile	2011-05-17 15:04:08.622043080 +0200
@@ -33,6 +33,8 @@ PEGASUS_ZOS_PROGRAM_OBJECT = yes
 DIR = Clients/osinfo
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegcliutils \
     peggetoopt \
diff -up pegasus/src/Clients/repupgrade/Makefile_orig pegasus/src/Clients/repupgrade/Makefile
--- pegasus/src/Clients/repupgrade/Makefile_orig	2011-05-17 15:03:36.222905432 +0200
+++ pegasus/src/Clients/repupgrade/Makefile	2011-05-17 15:03:48.013774882 +0200
@@ -34,6 +34,8 @@ DIR = Clients/repupgrade
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 LIBRARIES = \
diff -up pegasus/src/Clients/wbemexec/Makefile_orig pegasus/src/Clients/wbemexec/Makefile
--- pegasus/src/Clients/wbemexec/Makefile_orig	2011-05-17 15:02:46.254981788 +0200
+++ pegasus/src/Clients/wbemexec/Makefile	2011-05-17 15:02:59.917148729 +0200
@@ -34,6 +34,8 @@ DIR = Clients/wbemexec
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 LIBRARIES = \
diff -up pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_orig pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile
--- pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile_orig	2011-05-17 14:59:20.270319135 +0200
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2011-05-17 14:59:55.019829684 +0200
@@ -30,6 +30,8 @@ ROOT = ../../../../..
 DIR = Pegasus/Compiler/cmdline/cimmofl
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 PROGRAM = cimmofl
diff -up pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_orig pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile
--- pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile_orig	2011-05-17 14:58:44.334620532 +0200
+++ pegasus/src/Pegasus/Compiler/cmdline/cimmof/Makefile	2011-05-17 14:59:10.555778484 +0200
@@ -32,6 +32,8 @@ include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_CMDLINE_INTERNAL -DPEGASUS_INTERNALONLY
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegcompiler \
     pegclient \
diff -up pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_orig pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile
--- pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile_orig	2011-05-17 14:58:03.166092772 +0200
+++ pegasus/src/Pegasus/ProviderManagerService/ProviderAgent/Makefile	2011-05-17 14:58:22.652182571 +0200
@@ -32,6 +32,8 @@ DIR = Pegasus/ProviderManagerService/Pro
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 LIBRARIES = \
     pegpmrouter \
     pegprovidermanager \
diff -up pegasus/src/Pegasus/Server/Makefile_orig pegasus/src/Pegasus/Server/Makefile
--- pegasus/src/Pegasus/Server/Makefile_orig	2011-05-17 14:57:08.349400296 +0200
+++ pegasus/src/Pegasus/Server/Makefile	2011-05-17 14:57:33.724424287 +0200
@@ -32,6 +32,8 @@ DIR = Pegasus/Server
 
 include $(ROOT)/mak/config.mak
 
+FLAGS := $(FLAGS:-fPIC=-fPIE)
+
 EXTRA_INCLUDES = $(SYS_INCLUDES)
 
 LOCAL_DEFINES = -DPEGASUS_SERVER_INTERNAL -DPEGASUS_INTERNALONLY
