diff --git a/gpg2.changes b/gpg2.changes
index 2bf79f5..9441fad 100644
--- a/gpg2.changes
+++ b/gpg2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 31 10:00:35 UTC 2011 - puzel@suse.com
+
+- link with -pie 
+
 -------------------------------------------------------------------
 Fri Aug 19 01:11:42 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/gpg2.spec b/gpg2.spec
index b00d842..d13637f 100644
--- a/gpg2.spec
+++ b/gpg2.spec
@@ -80,10 +80,12 @@ autoreconf -fi
 # build PIEs (position independent executables) for address space randomisation:
 %ifarch s390x %sparc
 # s390x needs to use the large PIE model (at least for gpg.c):
-CFLAGS="%{optflags} -fPIE" LDFLAGS=-pie \
+PIE="-fPIE" 
 %else
-CFLAGS="%{optflags} -fpie" LDFLAGS=-pie \
+PIE="-fpie"
 %endif
+export CFLAGS="%{optflags} ${PIE}"
+export LDFLAGS=-pie
 %configure \
     --libexecdir=%{_libdir} \
     --docdir=%{_docdir}/%{name} \