diff --git a/spice-vdagent.service b/spice-vdagent.service
new file mode 100644
index 0000000..09590b9
--- /dev/null
+++ b/spice-vdagent.service
@@ -0,0 +1,5 @@
+[Unit] 
+Description=Spice guest session agent
+
+[Service] 
+ExecStart=/usr/bin/spice-vdagent -x
diff --git a/spice-vdagent.spec b/spice-vdagent.spec
index 13971ea..5680e74 100644
--- a/spice-vdagent.spec
+++ b/spice-vdagent.spec
@@ -1,12 +1,13 @@
 Name:           spice-vdagent
 Version:        0.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Agent for Spice guests
 License:        GPLv3+
 URL:            https://spice-space.org/
 Source0:        https://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
 Source1:        https://spice-space.org/download/releases/%{name}-%{version}.tar.bz2.sig
 Source2:        jrope-7FDAB9AF.keyring
+Source3:        spice-vdagent.service
 BuildRequires: make
 BuildRequires:  systemd-devel
 BuildRequires:  glib2-devel >= 2.50
@@ -40,11 +41,13 @@ autoreconf -fi
 
 %build
 %configure --with-session-info=systemd --with-init-script=systemd
-make %{?_smp_mflags} V=2
+%make_build V=2
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT V=2
+%make_install V=2
+
+install -D -p -m644 %{SOURCE3} %{buildroot}%{_userunitdir}/spice-vdagent.service
 
 
 %post
@@ -63,6 +66,7 @@ make install DESTDIR=$RPM_BUILD_ROOT V=2
 %{_unitdir}/spice-vdagentd.service
 %{_unitdir}/spice-vdagentd.socket
 %{_prefix}/lib/tmpfiles.d/spice-vdagentd.conf
+%{_userunitdir}/spice-vdagent.service
 %{_bindir}/spice-vdagent
 %{_sbindir}/spice-vdagentd
 %{_var}/run/spice-vdagentd
@@ -74,6 +78,10 @@ make install DESTDIR=$RPM_BUILD_ROOT V=2
 
 
 %changelog
+* Wed Jul 14 2021 Rex Dieter <rdieter@fedoraproject.org> - 0.21.0-3
+- add user spice-vdgant.service (#1951580)
+- use %%make_build/%%make_install
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.21.0-2
 - Rebuilt for updated systemd-rpm-macros
   See https://pagure.io/fesco/issue/2583.