diff --git a/SOURCES/evince-40.4-quit-shortcut.patch b/SOURCES/evince-40.4-quit-shortcut.patch
new file mode 100644
index 0000000..49a4659
--- /dev/null
+++ b/SOURCES/evince-40.4-quit-shortcut.patch
@@ -0,0 +1,31 @@
+From ad28a28e94c63c9ed44d01cf274e487ec85f2a46 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Wed, 13 Oct 2021 11:00:07 +0200
+Subject: [PATCH] Remove "Quit" from shortcuts page
+
+The shortcut "Ctrl + q" does not do anything.
+---
+ shell/help-overlay.ui | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/shell/help-overlay.ui b/shell/help-overlay.ui
+index d2057348..ced1dd56 100644
+--- a/shell/help-overlay.ui
++++ b/shell/help-overlay.ui
+@@ -396,13 +396,6 @@
+                 <property name="accelerator">&lt;Primary&gt;W</property>
+               </object>
+             </child>
+-            <child>
+-              <object class="GtkShortcutsShortcut">
+-                <property name="visible">True</property>
+-                <property name="title" translatable="yes" context="shortcut window">Quit</property>
+-                <property name="accelerator">&lt;Primary&gt;Q</property>
+-              </object>
+-            </child>
+             <child>
+               <object class="GtkShortcutsShortcut">
+                 <property name="visible">True</property>
+-- 
+2.31.1
+
diff --git a/SPECS/evince.spec b/SPECS/evince.spec
index 89bdcaa..f49f5db 100644
--- a/SPECS/evince.spec
+++ b/SPECS/evince.spec
@@ -4,7 +4,7 @@
 
 Name:           evince
 Version:        40.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Document viewer
 
 License:        GPLv2+ and GPLv3+ and LGPLv2+ and MIT and Afmparse
@@ -14,6 +14,9 @@ Source0:        https://download.gnome.org/sources/%{name}/40/%{name}-%{version}
 # https://bugzilla.redhat.com/show_bug.cgi?id=1975150
 Patch1:         evince-40.1-covscan.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=2006768
+Patch2:         evince-40.4-quit-shortcut.patch
+
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
 BuildRequires:  gettext-devel
@@ -166,6 +169,11 @@ It provides the printing preview for the GTK printing dialog.
 %find_lang evince --with-gnome
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+rm -f $RPM_BUILD_ROOT%{_datadir}/metainfo/evince-pdfdocument.metainfo.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/metainfo/evince-psdocument.metainfo.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/metainfo/evince-tiffdocument.metainfo.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/metainfo/evince-comicsdocument.metainfo.xml
+rm -f $RPM_BUILD_ROOT%{_datadir}/metainfo/evince-xpsdocument.metainfo.xml
 
 %check
 appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/org.gnome.Evince.appdata.xml
@@ -201,25 +209,20 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %dir %{_libdir}/evince/4/backends
 %{_libdir}/evince/4/backends/libpdfdocument.so
 %{_libdir}/evince/4/backends/pdfdocument.evince-backend
-%{_datadir}/metainfo/evince-pdfdocument.metainfo.xml
 
 %{_libdir}/evince/4/backends/libpsdocument.so
 %{_libdir}/evince/4/backends/psdocument.evince-backend
-%{_datadir}/metainfo/evince-psdocument.metainfo.xml
 
 %{_libdir}/evince/4/backends/libtiffdocument.so
 %{_libdir}/evince/4/backends/tiffdocument.evince-backend
-%{_datadir}/metainfo/evince-tiffdocument.metainfo.xml
 
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/evince/4/backends/libcomicsdocument.so
 %{_libdir}/evince/4/backends/comicsdocument.evince-backend
-%{_datadir}/metainfo/evince-comicsdocument.metainfo.xml
 %endif
 
 %{_libdir}/evince/4/backends/libxpsdocument.so
 %{_libdir}/evince/4/backends/xpsdocument.evince-backend
-%{_datadir}/metainfo/evince-xpsdocument.metainfo.xml
 
 %{_libdir}/girepository-1.0/EvinceDocument-3.0.typelib
 %{_libdir}/girepository-1.0/EvinceView-3.0.typelib
@@ -266,6 +269,15 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Evince-p
 %{_mandir}/man1/evince-previewer.1*
 
 %changelog
+* Tue Nov 02 2021 Marek Kasik <mkasik@redhat.com> - 40.4-3
+- Remove Ctrl+q shortcut from shortcuts page
+- because it does nothing.
+- Resolves: #2006768
+
+* Wed Sep 15 2021 Marek Kasik <mkasik@redhat.com> - 40.4-2
+- Remove metainfo for plugins since they are not real addons
+- Resolves: #2001781
+
 * Mon Aug 16 2021 Marek Kasik <mkasik@redhat.com> - 40.4-1
 - Update to 40.4
 - Resolves: #1991425