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 277878d..9cfe207 100644
--- a/SPECS/gpm.spec
+++ b/SPECS/gpm.spec
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console
 Name: gpm
 Version: 1.20.7
-Release: 15%{?dist}
+Release: 17%{?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 +11,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
-# 4.] rm -rf %{name}-%{version}/doc/specs
-# 5.] 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
+# 4.] rm -rf %%{name}-%%{version}/doc/specs
+# 5.] tar cJf %%{name}-%%{version}.tar.xz %%{name}-%%{version}
 
 Source: %{name}-%{version}.tar.xz
 Source1: gpm.service
@@ -48,7 +48,7 @@ includes a program to allow pop-up menus to appear at the click of a
 mouse button.
 
 %package libs
-Summary: Dynamic library for for the gpm
+Summary: Dynamic library for gpm
 Group: System Environment/Libraries
 
 %description libs
@@ -79,8 +79,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
@@ -92,9 +90,10 @@ mouse support to text-based Linux applications.
 %patch10 -p1
 %patch11 -p1
 
-#%patch7 -p1 -b .capability
+#%%patch7 -p1 -b .capability
 
 %build
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -170,6 +169,14 @@ fi
 %{_libdir}/libgpm.a
 
 %changelog
+* Mon Jan 18 2021 Jiri Kucera <jkucera@redhat.com> - 1.20.7-17
+- Put autogen.sh to proper place
+  Related: #1854555
+
+* Fri Jan 15 2021 Jiri Kucera <jkucera@redhat.com> - 1.20.7-16
+- Fix typo in description of gpm-libs subpackage
+  Resolves: #1854555
+
 * Fri Feb 23 2018 Florian Weimer <fweimer@redhat.com> - 1.20.7-15
 - Use default build flags (PIE works now)