diff --git a/modem-manager-gui.spec b/modem-manager-gui.spec
index ef66488..678c0f7 100644
--- a/modem-manager-gui.spec
+++ b/modem-manager-gui.spec
@@ -4,7 +4,7 @@ Summary(de):   Grafische Oberfläche für ModemManager
 Summary(ru):   Графический интерфейс для демона ModemManager
 
 Version:       0.0.20
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       GPLv3
 
 URL:           https://linuxonly.ru/page/modem-manager-gui
@@ -16,8 +16,13 @@ Patch1: 0001-Move-the-NetworkManager-dispatcher-script-out-of-etc.patch
 # Appdata XML validation fails
 Patch2: 0002-add-missing-appdata-tags.patch
 
+# Use meson for build? Otherwise, use make.
 %global build_using_meson 1
-%global with_ofono 1
+
+# Enable/disable plugins.
+%global with_connman 0
+%global with_ofono   1
+%global with_ppp     1
 
 BuildRequires: gcc
 BuildRequires: desktop-file-utils
@@ -90,13 +95,14 @@ Funktionen:
   с последующей конвертацией в системную кодировку UTF8.
 - Сканирование доступных мобильных сетей.
 
-
+%if %{with_connman}
 %package cm-connman
 Summary: Use connman to manage connections in %{name}
 Requires: connman >= 1.12
 Provides: %{name}-cm%{?_isa}
 %description cm-connman
 Plugin for %{name} allowing to use connman as the connection manager.
+%endif
 
 %package cm-NetworkManager
 Summary: Use NetworkManager to manage connections in %{name}
@@ -107,12 +113,14 @@ Provides: %{name}-cm%{?_isa}
 Plugin for %{name} allowing to use NetworkManager
 as the connection manager.
 
+%if %{with_ppp}
 %package cm-pppd
 Summary: Use pppd to manage connections in %{name}
 Requires: ppp >= 2.4.5
 Provides: %{name}-cm%{?_isa}
 %description cm-pppd
 Plugin for %{name} allowing to use pppd as the connection manager.
+%endif
 
 %package mm-ModemManager
 Summary: Use ModemManager to manage modems in %{name}
@@ -168,8 +176,16 @@ sed -e 's|/usr/bin/env python3|/usr/bin/python3|' \
 # Remove plugin for obsolete ModemManager version
 rm %{buildroot}/%{_libdir}/%{name}/modules/libmodmm_mm06.so
 
+%if !%{with_connman}
+    find %{buildroot} -name '*connman*.so*' -printf 'Removed unused file: %p\n' -delete
+%endif
+
 %if !%{with_ofono}
-    find %{buildroot} -name '*ofono*' -exec rm '{}' ';'
+    find %{buildroot} -name '*ofono*.so*' -printf 'Removed unused file: %p\n' -delete
+%endif
+
+%if !%{with_ppp}
+    find %{buildroot} -name '*pppd*.so*' -printf 'Removed unused file: %p\n' -delete
 %endif
 
 
@@ -194,15 +210,19 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.1.*
 %{_mandir}/*/man1/%{name}.1.*
 
+%if %{with_connman}
 %files cm-connman
 %{_libdir}/%{name}/modules/libmodcm_connman112.so
+%endif
 
 %files cm-NetworkManager
 %{_libdir}/%{name}/modules/libmodcm_nm09.so
 %{_prefix}/lib/NetworkManager/dispatcher.d/95-mmgui-timestamp-notifier
 
+%if %{with_ppp}
 %files cm-pppd
 %{_libdir}/%{name}/modules/libmodcm_pppd245.so
+%endif
 
 %files mm-ModemManager
 %{_libdir}/%{name}/modules/libmodmm_mm07.so
@@ -215,6 +235,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Sat May 01 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.0.20-4
+- Disable connman support (orphaned and retired) - fixes rhbz#1955847
+
 * Mon Mar 29 2021 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.0.20-3
 - Re-enable ofono support (unretired in F34+)