diff --git a/system-group-hardware.conf b/system-group-hardware.conf
index f32e664..b4474fd 100644
--- a/system-group-hardware.conf
+++ b/system-group-hardware.conf
@@ -10,5 +10,7 @@ g cdrom   -     -
 g dialout -     -
 g disk    -     -
 g input   -     -
+g kvm     -     -
+g lp      -     -
 g tape    -     -
 g video   -     -
diff --git a/system-user-lp.conf b/system-user-lp.conf
index 3ba35b8..579fc40 100644
--- a/system-user-lp.conf
+++ b/system-user-lp.conf
@@ -1,3 +1,2 @@
 # Type Name ID GECOS [HOME]
 u lp - "Printing daemon" /var/spool/lpd
-g lp -
diff --git a/system-user-uuidd.conf b/system-user-uuidd.conf
new file mode 100644
index 0000000..d7efe01
--- /dev/null
+++ b/system-user-uuidd.conf
@@ -0,0 +1,3 @@
+# Type Name ID GECOS [HOME]
+g uuidd - 
+u uuidd - "User for uuidd" /var/run/uuidd
diff --git a/system-users.changes b/system-users.changes
index f2360d8..d2dd91e 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Sep 14 14:40:04 CEST 2017 - kukuk@suse.de
+
+- uuidd does not need group daemon, Copy&Paste error.
+
+-------------------------------------------------------------------
+Thu Sep 14 14:37:36 CEST 2017 - kukuk@suse.de
+
+- udev needs groups kvm and lp: [bsc#1058703]
+  - Add group kvm to system-group-hardware
+  - Move group lp from system-user-lp to system-group-hardware
+
+-------------------------------------------------------------------
+Tue Sep 12 12:31:55 CEST 2017 - sbrabec@suse.com
+
+- Add system-user-uuidd.conf (boo#1057937#c3).
+
 -------------------------------------------------------------------
 Mon Aug 21 08:48:31 CEST 2017 - kukuk@suse.de
 
diff --git a/system-users.spec b/system-users.spec
index d130362..3ac8ac4 100644
--- a/system-users.spec
+++ b/system-users.spec
@@ -37,6 +37,7 @@ Source13:       system-user-ftp.conf
 Source14:       system-user-lp.conf
 Source15:       system-user-nobody.conf
 Source16:       system-user-upsd.conf
+Source17:       system-user-uuidd.conf
 BuildRequires:  sysuser-shadow
 BuildRequires:  sysuser-tools
 BuildArch:      noarch
@@ -115,7 +116,8 @@ Group:          System/Fhs
 %{sysusers_requires}
 
 %description -n system-group-hardware
-This package provides some hardware related system groups.
+This package provides some hardware related system groups
+required by udev.
 
 %package -n system-group-wheel
 Summary:        System group 'wheel'
@@ -150,8 +152,10 @@ Group:          System/Fhs
 This package provides the system account and group 'ftp'.
 
 %package -n system-user-lp
-Summary:        System user and group lp
+Summary:        System user lp
 Group:          System/Fhs
+Requires(pre):  group(lp)
+#!BuildIgnore:  group(lp)
 %{sysusers_requires}
 
 %description -n system-user-lp
@@ -176,6 +180,13 @@ Requires(pre):  group(daemon)
 %description -n system-user-upsd
 This package provides the system account 'upsd'.
 
+%package -n system-user-uuidd
+Summary:        System user and group uuidd
+Group:          System/Fhs
+%{sysusers_requires}
+
+%description -n system-user-uuidd
+This package provides the system account and group 'uuidd'.
 
 %prep
 %setup -q -c -T
@@ -196,6 +207,7 @@ This package provides the system account 'upsd'.
 %sysusers_generate_pre %{SOURCE14} lp
 %sysusers_generate_pre %{SOURCE15} nobody
 %sysusers_generate_pre %{SOURCE16} upsd
+%sysusers_generate_pre %{SOURCE17} uuidd
 
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
@@ -206,6 +218,7 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/man
 mkdir -p %{buildroot}%{_localstatedir}/lib/wwwrun
 mkdir -p %{buildroot}%{_localstatedir}/spool/clientmqueue
 mkdir -p %{buildroot}%{_localstatedir}/spool/lpd
+mkdir -p %{buildroot}%{_localstatedir}/run/uuidd
 mkdir -p %{buildroot}/srv/ftp
 mkdir -p %{buildroot}%{_localstatedir}/lib/nobody
 install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-uucp.conf
@@ -223,6 +236,7 @@ install -m 644 %{SOURCE13} %{buildroot}%{_sysusersdir}/system-user-ftp.conf
 install -m 644 %{SOURCE14} %{buildroot}%{_sysusersdir}/system-user-lp.conf
 install -m 644 %{SOURCE15} %{buildroot}%{_sysusersdir}/system-user-nobody.conf
 install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf
+install -m 644 %{SOURCE17} %{buildroot}%{_sysusersdir}/system-user-uuidd.conf
 
 %pre -n system-user-uucp -f uucp.pre
 %pre -n system-user-games -f games.pre
@@ -242,6 +256,7 @@ install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf
 /usr/sbin/usermod -s /bin/bash nobody
 
 %pre -n system-user-upsd -f upsd.pre
+%pre -n system-user-uuidd -f uuidd.pre
 
 %files -n system-user-uucp
 %defattr(-,root,root)
@@ -312,4 +327,8 @@ install -m 644 %{SOURCE16} %{buildroot}%{_sysusersdir}/system-user-upsd.conf
 %defattr(-,root,root)
 %{_sysusersdir}/system-user-upsd.conf
 
+%files -n system-user-uuidd
+%defattr(-,root,root)
+%{_sysusersdir}/system-user-uuidd.conf
+
 %changelog