diff --git a/haveged.changes b/haveged.changes
index d71aab2..2010536 100644
--- a/haveged.changes
+++ b/haveged.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  9 21:20:37 UTC 2012 - crrodriguez@opensuse.org
+
+- build with -fpie 
+
 -------------------------------------------------------------------
 Sat Dec 31 05:09:38 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/haveged.spec b/haveged.spec
index e910b8d..0d6be52 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package haveged
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,10 +21,10 @@
 Name:           haveged
 Version:        1.3
 Release:        0
-License:        GPL-3.0
 Summary:        Feed entropy into random pool
-Url:            http://www.issihosts.com/haveged/
+License:        GPL-3.0
 Group:          System/Daemons
+Url:            http://www.issihosts.com/haveged/
 Source0:        http://www.issihosts.com/haveged/%{name}-%{version}%{extra_ver}.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.service
@@ -59,7 +59,8 @@ For more informations see http://www.issihosts.com/haveged/
 
 %build
 autoreconf -fiv
-export LDFLAGS="-Wl,-z,relro,-z,now"
+export CFLAGS="%optflags -fpie"
+export LDFLAGS="-Wl,-z,relro,-z,now -pie"
 %configure --enable-nistest=yes --enable-daemon=yes
 make %{?_smp_mflags}