diff --git a/mailimporter.changes b/mailimporter.changes
index d8f3861..13d929c 100644
--- a/mailimporter.changes
+++ b/mailimporter.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 18 08:27:52 UTC 2016 - jengelh@inai.de
+
+- Set RPM groups
+
 -------------------------------------------------------------------
 Sat May  7 10:13:52 UTC 2016 - tittiatcoke@gmail.com
 
diff --git a/mailimporter.spec b/mailimporter.spec
index d591e7d..bf66b3f 100644
--- a/mailimporter.spec
+++ b/mailimporter.spec
@@ -21,8 +21,7 @@ Version:        16.04.1
 Release:        0
 Summary:        Base package of kdepim
 License:        GPL-2.0 and LGPL-2.1+
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Url:            http://www.kde.org
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  akonadi-calendar-devel
@@ -109,8 +108,7 @@ This package contains the mailimporter library.
 %package -n libKF5MailImporter5
 Summary:        MailImporter library for kdepim
 License:        LGPL-2.1+
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group:          Development/Libraries
+Group:          System/Libraries
 
 %description -n libKF5MailImporter5
 MailImporter Library
@@ -121,8 +119,7 @@ MailImporter Library
 %package devel
 Summary:        Development package for mailimporter
 License:        LGPL-2.1+
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Requires:       libKF5MailImporter5 = %{version}
 
 %description devel