diff --git a/cmake-gui.changes b/cmake-gui.changes
index 337533c..8ed5238 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jun 26 21:20:16 UTC 2016 - mpluskal@suse.com
+
+- Update cmake.macros to enable PIE by default
+- Build with more secure LDFLAGS
+
 -------------------------------------------------------------------
 Sat Apr 16 12:57:14 UTC 2016 - astieger@suse.com
 
diff --git a/cmake-gui.spec b/cmake-gui.spec
index 9661a08..7e1efbe 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -81,8 +81,9 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'`  %{SOURC
 
 %build
 EXTRA_FLAGS="--qt-gui"
-export CXXFLAGS="%{optflags}"
-export CFLAGS="$CXXFLAGS"
+export CXXFLAGS="%{optflags} -fPIE"
+export CFLAGS="%{optflags} -fPIE"
+export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie"
 # FIXME: you should use the %%configure macro
 ./configure \
     --prefix=%{_prefix} \
diff --git a/cmake.changes b/cmake.changes
index e0293cf..b65be2a 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jun 26 21:19:14 UTC 2016 - mpluskal@suse.com
+
+- Update cmake.macros to enable PIE by default
+- Build with more secure LDFLAGS
+
 -------------------------------------------------------------------
 Fri Jun 10 02:15:47 UTC 2016 - sflees@suse.de
 
diff --git a/cmake.macros b/cmake.macros
index 97f7cbc..e74411c 100644
--- a/cmake.macros
+++ b/cmake.macros
@@ -18,12 +18,12 @@
         -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
         -DCMAKE_BUILD_TYPE=None \\\
-        -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\
-        -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\
-        -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\
-        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\
-        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\
-        -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\
+        -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -fPIE -DNDEBUG" \\\
+        -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -fPIE -DNDEBUG" \\\
+        -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -fPIE -DNDEBUG" \\\
+        -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\
+        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\
+        -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \\\
 %if "%{?_lib}" == "lib64" \
         -DLIB_SUFFIX=64 \\\
 %endif \
diff --git a/cmake.spec b/cmake.spec
index 1a65aa0..c990717 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -75,8 +75,9 @@ echo "`grep %{name}-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'`  %{SOU
 %patch7 -p1
 
 %build
-export CXXFLAGS="%{optflags}"
-export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags} -fPIE"
+export CFLAGS="%{optflags} -fPIE"
+export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie"
 # FIXME: you should use the %%configure macro
 ./configure \
     --prefix=%{_prefix} \