diff --git a/NetworkManager.spec b/NetworkManager.spec
index 7b4b45e..7bfed27 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -101,6 +101,7 @@ Summary: Network connection manager and user applications
 Epoch: %{epoch_version}
 Version: %{rpm_version}
 Release: %{release_version}%{?snap}%{?dist}
+Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
@@ -229,6 +230,7 @@ services.
 %if %{with adsl}
 %package adsl
 Summary: ADSL device plugin for NetworkManager
+Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
 Obsoletes: NetworkManager-atm
@@ -241,6 +243,7 @@ This package contains NetworkManager support for ADSL devices.
 %if %{with bluetooth}
 %package bluetooth
 Summary: Bluetooth device plugin for NetworkManager
+Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release}
 Requires: bluez >= 4.101-5
@@ -255,6 +258,7 @@ This package contains NetworkManager support for Bluetooth devices.
 %if %{with team}
 %package team
 Summary: Team device plugin for NetworkManager
+Group: System Environment/Base
 BuildRequires: teamd-devel
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
@@ -269,6 +273,7 @@ This package contains NetworkManager support for team devices.
 %if %{with wifi}
 %package wifi
 Summary: Wifi plugin for NetworkManager
+Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 
 %if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7)
@@ -290,6 +295,7 @@ This package contains NetworkManager support for Wifi and OLPC devices.
 %if %{with wwan}
 %package wwan
 Summary: Mobile broadband device plugin for NetworkManager
+Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: ModemManager
 Obsoletes: NetworkManager < %{obsoletes_device_plugins}
@@ -303,6 +309,7 @@ devices.
 %if %{with ovs}
 %package ovs
 Summary: Open vSwitch device plugin for NetworkManager
+Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 %if 0%{?rhel} == 0
 Requires: openvswitch
@@ -316,6 +323,7 @@ This package contains NetworkManager support for Open vSwitch bridges.
 %if %{with ppp}
 %package ppp
 Summary: PPP plugin for NetworkManager
+Group: System Environment/Base
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: ppp = %{ppp_version}
 Requires: NetworkManager = %{epoch}:%{version}-%{release}
@@ -328,6 +336,7 @@ This package contains NetworkManager support for PPP.
 
 %package glib
 Summary: Libraries for adding NetworkManager support to applications (old API).
+Group: Development/Libraries
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Conflicts: NetworkManager-libnm < %{epoch}:%{version}-%{release}
@@ -340,6 +349,7 @@ the older NetworkManager API. See also NetworkManager-libnm.
 
 %package glib-devel
 Summary: Header files for adding NetworkManager support to applications (old API).
+Group: Development/Libraries
 Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
 Requires: pkgconfig
@@ -357,6 +367,7 @@ This is the older NetworkManager API.  See also NetworkManager-libnm-devel.
 
 %package libnm
 Summary: Libraries for adding NetworkManager support to applications (new API).
+Group: Development/Libraries
 Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release}
 
 %description libnm
@@ -367,6 +378,7 @@ NetworkManager API.  See also NetworkManager-glib.
 
 %package libnm-devel
 Summary: Header files for adding NetworkManager support to applications (new API).
+Group: Development/Libraries
 Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: glib2-devel
 Requires: pkgconfig
@@ -380,6 +392,7 @@ is the new NetworkManager API. See also NetworkManager-glib-devel.
 %if %{with connectivity_fedora}
 %package config-connectivity-fedora
 Summary: NetworkManager config file for connectivity checking via Fedora servers
+Group: System Environment/Base
 BuildArch: noarch
 Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
 
@@ -392,6 +405,7 @@ via Fedora infrastructure.
 %if %{with connectivity_redhat}
 %package config-connectivity-redhat
 Summary: NetworkManager config file for connectivity checking via Red Hat servers
+Group: System Environment/Base
 BuildArch: noarch
 Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
 
@@ -403,6 +417,7 @@ via Red Hat infrastructure.
 
 %package config-server
 Summary: NetworkManager config file for "server-like" defaults
+Group: System Environment/Base
 BuildArch: noarch
 
 %description config-server
@@ -418,6 +433,7 @@ deployments.
 
 %package dispatcher-routing-rules
 Summary: NetworkManager dispatcher file for advanced routing rules
+Group: System Environment/Base
 BuildArch: noarch
 Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release}
@@ -431,6 +447,7 @@ configurations using "/etc/sysconfig/network-scripts/rule-NAME" files
 %if 0%{with_nmtui}
 %package tui
 Summary: NetworkManager curses-based UI
+Group: System Environment/Base
 Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}