diff --git a/SOURCES/gpm-1.20.1-weak-wgetch.patch b/SOURCES/gpm-1.20.1-weak-wgetch.patch
index 2546e17..17bbd23 100644
--- a/SOURCES/gpm-1.20.1-weak-wgetch.patch
+++ b/SOURCES/gpm-1.20.1-weak-wgetch.patch
@@ -14,9 +14,9 @@
  
  int Gpm_Wgetch(WINDOW *win)
  {
---- gpm-1.20.1/configure.ac.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
-+++ gpm-1.20.1/configure.ac	2004-03-22 15:51:24.000000000 -0500
-@@ -115,7 +115,7 @@
+--- gpm-1.20.1/configure.ac.footer.weak-wgetch	2004-03-22 15:49:51.000000000 -0500
++++ gpm-1.20.1/configure.ac.footer	2004-03-22 15:51:24.000000000 -0500
+@@ -129,7 +129,7 @@
              AC_CHECK_LIB($i, wgetch,,,$TERMLIBS)
          else :; fi
      done
diff --git a/SPECS/gpm.spec b/SPECS/gpm.spec
index 1324881..db67434 100644
--- a/SPECS/gpm.spec
+++ b/SPECS/gpm.spec
@@ -1,7 +1,9 @@
+%define _hardened_build 1
+
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only
 Group: System Environment/Daemons
 URL: http://www.nico.schottelius.org/software/gpm/
@@ -11,10 +13,10 @@ URL: http://www.nico.schottelius.org/software/gpm/
 # and that's why we need to remove them and recreate the tarball
 #
 # 1.] mkdir docs-removal && cd docs-removal
-# 2.] wget http://www.nico.schottelius.org/software/gpm/archives/%{name}-%{version}.tar.lzma
-# 3.] tar xf %{name}-%{version}.tar.lzma
-# 3.] rm -rf %{name}-%{version}/doc/specs
-# 4.] tar cJf %{name}-%{version}.tar.xz %{name}-%{version}
+# 2.] wget http://www.nico.schottelius.org/software/gpm/archives/%%{name}-%%{version}.tar.lzma
+# 3.] tar xf %%{name}-%%{version}.tar.lzma
+# 3.] rm -rf %%{name}-%%{version}/doc/specs
+# 4.] tar cJf %%{name}-%%{version}.tar.xz %%{name}-%%{version}
 
 Source: %{name}-%{version}.tar.xz
 Source1: gpm.service
@@ -73,9 +75,6 @@ mouse support to text-based Linux applications.
 
 %prep
 %setup -q
-
-./autogen.sh
-
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .lib-silent
 %patch4 -p1 -b .close-fds
@@ -84,14 +83,12 @@ mouse support to text-based Linux applications.
 # not sure if this is really needed
 %patch8 -p1
 
-#%patch7 -p1 -b .capability
+#%%patch7 -p1 -b .capability
+
+./autogen.sh
 
-%build
-# ld fails with PIE
-#LDFLAGS='-Wl,-z,relro,-z,now -pie'
-#CFLAGS='-fPIE -DPIE'
 
-LDFLAGS='-Wl,-z,relro,-z,now'
+%build
 %configure
 make %{?_smp_mflags}
 
@@ -127,11 +124,6 @@ if [ -e %{_infodir}/gpm.info.gz ]; then
   /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir || :
 fi
 
-%ifnarch s390 s390x
-%triggerun -- gpm < 1.20.6-15
-/bin/systemctl enable gpm.service >/dev/null 2>&1 || :
-%endif
-
 %preun
 %ifnarch s390 s390x
 %systemd_preun gpm.service
@@ -145,11 +137,6 @@ fi
 %systemd_postun_with_restart gpm.service
 %endif
 
-%triggerun -- gpm < 1.20.6-17
-%{_bindir}/systemd-sysv-convert --save gpm >/dev/null 2>&1 ||:
-/bin/systemctl enable gpm.service >/dev/null 2>&1
-/bin/systemctl try-restart gpm.service >/dev/null 2>&1 || :
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -177,6 +164,12 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Tue Mar 26 2019 Jiri Kucera <jkucera@redhat.com> - 1.20.7-6
+- Remove old scriptlets
+  Enable PIE and RELRO
+  ./autogen.sh runs too early
+  Resolves: #1092527, #1095444
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.20.7-5
 - Mass rebuild 2014-01-24