diff --git a/system-user-upsd.conf b/system-user-upsd.conf
new file mode 100644
index 0000000..c649863
--- /dev/null
+++ b/system-user-upsd.conf
@@ -0,0 +1,3 @@
+# Type Name ID GECOS [HOME]
+u upsd - "UPS daemon" /var/lib/empty
+m upsd daemon
diff --git a/system-users.changes b/system-users.changes
index 32a056f..fda5356 100644
--- a/system-users.changes
+++ b/system-users.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue May  2 17:51:52 CEST 2017 - sbrabec@suse.com
+
+- Add upsd for UPS daemon packages.
+
 -------------------------------------------------------------------
 Sat Apr  1 10:58:04 UTC 2017 - kukuk@suse.com
 
diff --git a/system-users.spec b/system-users.spec
index 2a5a90d..95d8d2e 100644
--- a/system-users.spec
+++ b/system-users.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package system-users
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,7 @@ Source12:       system-user-mail.conf
 Source13:       system-user-ftp.conf
 Source14:       system-user-lp.conf
 Source15:       system-user-nobody.conf
+Source16:       system-user-upsd.conf
 BuildRequires:  systemd
 BuildRequires:  sysuser-tools
 BuildArch:      noarch
@@ -46,8 +47,8 @@ This package provides various system users and their directories
 
 %package -n system-user-bin
 Summary:        System user and group 'bin'
-Group:          System/Fhs
 #!BuildIgnore:  user(daemon)
+Group:          System/Fhs
 Requires(pre):  user(daemon)
 %{sysusers_requires}
 
@@ -172,6 +173,15 @@ Group:          System/Fhs
 %description -n system-user-nobody
 This package provides the system account and group 'nobody'.
 
+%package -n system-user-upsd
+Summary:        System user upsd
+Group:          System/Fhs
+Requires(pre):  group(daemon)
+%{sysusers_requires}
+
+%description -n system-user-upsd
+This package provides the system account 'upsd'.
+
 
 %prep
 %setup -q -c -T
@@ -192,6 +202,7 @@ This package provides the system account and group 'nobody'.
 %sysusers_generate_pre %{SOURCE13} ftp
 %sysusers_generate_pre %{SOURCE14} lp
 %sysusers_generate_pre %{SOURCE15} nobody
+%sysusers_generate_pre %{SOURCE16} upsd
 
 %install
 mkdir -p %{buildroot}%{_sysusersdir}
@@ -219,6 +230,7 @@ install -m 644 %{SOURCE12} %{buildroot}%{_sysusersdir}/system-user-mail.conf
 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
 
 %pre -n system-user-uucp -f uucp.pre
 %pre -n system-user-games -f games.pre
@@ -235,6 +247,7 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysusersdir}/system-user-nobody.conf
 %pre -n system-user-ftp -f ftp.pre
 %pre -n system-user-lp -f lp.pre
 %pre -n system-user-nobody -f nobody.pre
+%pre -n system-user-upsd -f upsd.pre
 
 %files -n system-user-uucp
 %defattr(-,root,root)
@@ -305,4 +318,8 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysusersdir}/system-user-nobody.conf
 %dir %attr(0755,nobody,root) %{_localstatedir}/lib/nobody
 %{_sysusersdir}/system-user-nobody.conf
 
+%files -n system-user-upsd
+%defattr(-,root,root)
+%{_sysusersdir}/system-user-upsd.conf
+
 %changelog