diff --git a/config b/config
index d57ba5e..129d9cd 100644
--- a/config
+++ b/config
@@ -72,6 +72,7 @@ setOption('ValidGroups', [])
 setOption('StandardGroups', (
     'aegis',
     'antivir',
+    'arangodb',
     'at',
     'audio',
     'avahi',
@@ -212,6 +213,7 @@ setOption('StandardGroups', (
 setOption('StandardUsers', (
     'aegis',
     'amanda',
+    'arangodb',
     'asterisk',
     'at',
     'avahi',
diff --git a/rpmlint.changes b/rpmlint.changes
index e3f0c48..6ebc942 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 20 13:20:00 UTC 2013 - f.celler@triagens.de
+
+- Add user and group 'arangodb' for ArangoDB database server
+
 -------------------------------------------------------------------
 Wed Nov 20 08:58:25 UTC 2013 - krahmer@suse.com