diff --git a/thttpd.changes b/thttpd.changes
index 5fde36c..c34e3bf 100644
--- a/thttpd.changes
+++ b/thttpd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jul  5 09:43:36 UTC 2015 - vcizek@suse.com
+
+- build with pie and full relro
+
 -------------------------------------------------------------------
 Thu Jun 18 15:07:51 UTC 2015 - thehejik@suse.com
 
diff --git a/thttpd.spec b/thttpd.spec
index a03250a..39e2ce7 100644
--- a/thttpd.spec
+++ b/thttpd.spec
@@ -98,14 +98,11 @@ mv aclocal.m4 acinclude.m4
 libtoolize --force
 aclocal --force
 autoconf -f
-export V_CCOPT="%{optflags}"
-export CFLAGS="%{optflags}"
+export V_CCOPT="%{optflags} -fPIC -DPIC -fPIE"
+export CFLAGS="%{optflags} -fPIC -DPIC -fPIE"
+export LDFLAGS="-pie -Wl,-z,relro,-z,now"
 %configure
-%ifarch s390 s390x
-make F_PIE="-fPIE" -j1
-%else
-make F_PIE="-fpie" -j1
-%endif
+make
 
 %install
 install -d %{buildroot}%{_bindir} \