diff --git a/spice-vdagent.changes b/spice-vdagent.changes
index 21680d3..0558a0a 100644
--- a/spice-vdagent.changes
+++ b/spice-vdagent.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul  1 14:10:31 UTC 2014 - fcrozat@suse.com
+
+- Enable systemd service at initial install, it is needed for
+  udev rules to properly start the agent.
+
 -------------------------------------------------------------------
 Tue May 27 08:45:45 CEST 2014 - ohering@suse.de
 
diff --git a/spice-vdagent.spec b/spice-vdagent.spec
index 012ad0b..4714086 100644
--- a/spice-vdagent.spec
+++ b/spice-vdagent.spec
@@ -67,11 +67,19 @@ rm -rf %{buildroot}%{_sysconfdir}/rsyslog.d
 # create rc symlink
 ln -s  service %{buildroot}%{_sbindir}/rcspice-vdagentd
 
+mkdir -p %{buildroot}%{_datadir}/gdm/greeter/autostart
+
+mv %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/*.desktop %{buildroot}%{_datadir}/gdm/greeter/autostart
+rm -fr %{buildroot}%{_datadir}/gdm/autostart
+
 %pre
 %service_add_pre spice-vdagentd.service
 
 %post
 %service_add_post spice-vdagentd.service
+if [ "$1" -eq 1 ]; then
+    systemctl -q enable spice-vdagentd.service || :
+fi
 
 %preun
 %service_del_preun spice-vdagentd.service