diff --git a/libstoragemgmt.changes b/libstoragemgmt.changes
index 2ba3f45..66a1eda 100644
--- a/libstoragemgmt.changes
+++ b/libstoragemgmt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov  2 11:14:28 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Fix RPM groups.
+
 -------------------------------------------------------------------
 Thu Oct 25 02:40:17 UTC 2018 - nwang@suse.com
 
diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec
index c4ae47f..7ec66c6 100644
--- a/libstoragemgmt.spec
+++ b/libstoragemgmt.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -28,8 +28,8 @@ Name:           libstoragemgmt
 Version:        1.7.0
 Release:        0
 Summary:        Storage array management library
-License:        LGPL-2.1+ and GPL-2.0+
-Group:          System/Libraries
+License:        LGPL-2.1-or-later AND GPL-2.0-or-later
+Group:          Development/Libraries/C and C++
 Url:            https://github.com/libstorage/libstoragemgmt
 Source0:        https://github.com/libstorage/libstoragemgmt/releases/download/%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  fdupes
@@ -105,7 +105,7 @@ developing applications that use %{name}.
 
 %{?python_provide:%python_provide python3-%{name}}
 Summary:        Python client libraries and plug-in support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       %{name} = %{version}
 BuildArch:      noarch
 %if 0%{python3}
@@ -124,7 +124,7 @@ well as python framework support and open source plug-ins written in python.
 
 %{?python_provide:%python_provide python3-%{name}-clibs}
 Summary:        Python C extension for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       %{name} = %{version}-%{release}
 %if 0%{python3}
 %description    -n python3-%{name}-clibs
@@ -135,7 +135,7 @@ The python-%{name}-clibs package contains python C extentions for %{name}.
 
 %package        smis-plugin
 Summary:        Files for SMI-S generic array support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -147,12 +147,12 @@ Requires:       python-pywbem
 %endif
 
 %description    smis-plugin
-The %{name}-smis-plugin package contains plug-in for generic SMI-S
-array support.
+The %{name}-smis-plugin package contains plug-in for generic
+Storage Management Initiative Specification (SMI-S) array support.
 
 %package        netapp-plugin
 Summary:        Files for NetApp array support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -164,7 +164,7 @@ support.
 
 %package        targetd-plugin
 Summary:        Files for targetd array support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -176,7 +176,7 @@ array support.
 
 %package        nstor-plugin
 Summary:        Files for NexentaStor array support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -196,7 +196,7 @@ uevents generated by the kernel.
 
 %package        megaraid-plugin
 Summary:        Files for LSI MegaRAID support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -208,7 +208,7 @@ storage management via storcli.
 
 %package        hpsa-plugin
 Summary:        Files for HP SmartArray support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -220,7 +220,7 @@ management via hpssacli.
 
 %package        nfs-plugin
 Summary:        Files for nfs support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       %{name}-nfs-plugin-clibs = %{version}
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
@@ -232,7 +232,7 @@ The %{name}-nfs-plugin package contains the plugin for nfs based storage.
 
 %package        nfs-plugin-clibs
 Summary:        Python C extension module for %{name} NFS plugin
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       %{name} = %{version}
 
 %description    nfs-plugin-clibs
@@ -241,7 +241,7 @@ NFS plugin.
 
 %package        local-plugin
 Summary:        Files for HP local pseudo support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}
@@ -253,7 +253,7 @@ storage.
 
 %package        arcconf-plugin
 Summary:        Files for Microsemi storage support for %{name}
-Group:          System/Libraries
+Group:          Development/Languages/Python
 Requires:       python3-%{name} = %{version}
 Requires(post): python3-%{name} = %{version}
 Requires(postun): python3-%{name} = %{version}