diff --git a/config b/config
index caff194..d1e568d 100644
--- a/config
+++ b/config
@@ -80,8 +80,6 @@ addFilter('.*no-group-tag.*')
 addFilter('.*non-standard-group.*')
 
 setOption('StandardGroups', (
-    '_cscreen',
-    '_gns3',
     'aegis',
     'antivir',
     'arangodb',
@@ -91,17 +89,19 @@ setOption('StandardGroups', (
     'bacula',
     'beagleindex',
     'bigsister',
-    'bitlbee',
     'bin',
     'bird',
     'bitcoin',
+    'bitlbee',
     'boinc',
     'casaauth',
     'cdrom',
+    'ceilometer',
     'ceph',
     'cephadm',
     'chef',
     'chrony',
+    'cinder',
     'citadel',
     'colord',
     'conman',
@@ -110,6 +110,7 @@ setOption('StandardGroups', (
     'coturn',
     'crowbar',
     'cwbconv',
+    '_cscreen',
     'daapd',
     'daemon',
     'davfs2',
@@ -133,11 +134,15 @@ setOption('StandardGroups', (
     'ftp',
     'games',
     'gdm',
+    'gerbera',
     'geronimo',
+    'glance',
+    '_gns3',
     'grafana',
     'guixbuild',
     'haclient',
     'haldaemon',
+    'heat',
     'hsqldb',
     'icecast',
     'icecream',
@@ -151,6 +156,7 @@ setOption('StandardGroups', (
     'jetty5',
     'jitsi',
     'jonas',
+    'keystone',
     'kmem',
     'kolab',
     'kolab-n',
@@ -182,10 +188,12 @@ setOption('StandardGroups', (
     'nagcmd',
     'nagios',
     'named',
+    'neutron',
     'news',
     'nginx',
     'nobody',
     'nogroup',
+    'nova',
     'novell_nogroup',
     'novlxtier',
     '_nsd',
@@ -195,17 +203,8 @@ setOption('StandardGroups', (
     'oinstall',
     'openvswitch',
     'orthanc',
-    'ovirtagent',
-    'ceilometer',
-    'cinder',
-    'glance',
-    'heat',
-    'keystone',
-    'nova',
-    'neutron',
-    'swift',
-    'trove',
     'otrs',
+    'ovirtagent',
     'pcp',
     'pcpqa',
     'pdns',
@@ -218,8 +217,8 @@ setOption('StandardGroups', (
     'pound',
     'powersave',
     'privoxy',
-    'prosody',
     'prometheus',
+    'prosody',
     'ptokax',
     'public',
     'pulse',
@@ -230,6 +229,7 @@ setOption('StandardGroups', (
     'quagga',
     'quasselcore',
     'rabbitmq',
+    'radicale',
     'radiusd',
     'root',
     'sabayon-admin',
@@ -250,6 +250,7 @@ setOption('StandardGroups', (
     'sshd',
     'suse-ncc',
     'svn',
+    'swift',
     'synapse',
     'sys',
     'systemd-journal',
@@ -260,10 +261,11 @@ setOption('StandardGroups', (
     'tomcat4',
     'tor',
     'tox',
+    'trove',
     'trusted',
     'tryton',
-    'ts-shell',
     'tss',
+    'ts-shell',
     'tty',
     'unbound',
     'users',
@@ -291,8 +293,6 @@ setOption('StandardGroups', (
     ))
 
 setOption('StandardUsers', (
-    '_cscreen',
-    '_gns3',
     'aegis',
     'amanda',
     'aodh',
@@ -327,9 +327,10 @@ setOption('StandardUsers', (
     'coturn',
     'crowbar',
     'cyrus',
+    '_cscreen',
+    'daapd',
     'daemon',
     'davfs2',
-    'daapd',
     'ddclient',
     'dehydrated',
     'designate',
@@ -351,10 +352,12 @@ setOption('StandardUsers', (
     'ftp',
     'games',
     'gdm',
+    'gerbera',
     'geronimo',
     'glance',
     'gnats',
     'gnocchi',
+    '_gns3',
     'gnump3d',
     'grafana',
     'hacluster',
@@ -370,12 +373,12 @@ setOption('StandardUsers', (
     'ironic',
     'jabber',
     'jboss',
-    'jetty5',
     'jenkins',
+    'jetty5',
     'jibri',
     'jicofo',
-    'jvb',
     'jonas',
+    'jvb',
     'keystone',
     'kolab',
     'kolab-n',
@@ -437,8 +440,8 @@ setOption('StandardUsers', (
     'postgrey',
     'pound',
     'privoxy',
-    'prosody',
     'prometheus',
+    'prosody',
     'ptokax',
     'pulse',
     'puppet',
@@ -446,10 +449,11 @@ setOption('StandardUsers', (
     'quagga',
     'quasselcore',
     'rabbitmq',
+    'radicale',
     'radiusd',
     'radvd',
-    'root',
     '_rmt',
+    'root',
     'sabayon-admin',
     'sahara',
     'salt',
@@ -480,8 +484,8 @@ setOption('StandardUsers', (
     'tryton',
     'tss',
     'ulogd',
-    'upsd',
     'unbound',
+    'upsd',
     'uucp',
     'uuidd',
     'vacation',
@@ -784,7 +788,10 @@ setOption("DBUSServices.WhiteList", (
     "oddjob-mkhomedir.conf",
     # libvirt-dbus (bsc#1173093)
     "org.libvirt.service",
-    "org.libvirt.conf"
+    "org.libvirt.conf",
+    # powerdevil chargethreshold helper (bsc#1176474)
+    "org.kde.powerdevil.chargethresholdhelper.service",
+    "org.kde.powerdevil.chargethresholdhelper.conf",
 ))
 
 setOption("PAMModules.WhiteList", (
diff --git a/rpmlint.changes b/rpmlint.changes
index a2c8a81..685dc74 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Oct  1 12:43:35 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com>
+
+- whitelist D-Bus files for powerdevil chargethreshold (bsc#1176474)
+
+-------------------------------------------------------------------
+Thu Oct  1 07:51:10 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Add 'gerbera' as standard user and group
+
+-------------------------------------------------------------------
+Fri Sep 11 15:57:57 UTC 2020 - Ákos Szőts <szotsaki@gmail.com>
+
+- Alphabetise StandardGroups and StandardUsers
+- Add 'radicale' as a standard user and group
+
 -------------------------------------------------------------------
 Fri Aug 14 06:43:39 UTC 2020 - Marco Strigl <marco.strigl@suse.com>