diff --git a/glicid/services/virtualization.scm b/glicid/services/virtualization.scm
index 7f18eca..a2d65b6 100644
--- a/glicid/services/virtualization.scm
+++ b/glicid/services/virtualization.scm
@@ -14,11 +14,31 @@
 
 
 
-(define (qemu-guest-agent-shepherd-service config)
- (inherit gnu:qemu-guest-agent-shepherd-service)
- (requirement '(udev)) ;; GLiCID
+;(define (qemu-guest-agent-shepherd-service config)
+; (inherit gnu:qemu-guest-agent-shepherd-service)
+; (requirement '(udev)) ;; GLiCID
+;
+;)
+
+
+(define (qemu-guest-agent-shepherd-service config)
+  (let ((qemu   (gnu:qemu-guest-agent-configuration-qemu config))
+        (device (gnu:qemu-guest-agent-configuration-device config)))
+    (list
+     (shepherd-service
+      (provision '(qemu-guest-agent))
+      (requirement '(udev)) ;; GLiCID
+
+      (documentation "Run the QEMU guest agent.")
+      (start #~(make-forkexec-constructor
+                `(,(string-append #$qemu "/bin/qemu-ga")
+                  "--statedir" "/var/run"
+                  ,@(if (string-null? #$device)
+                        '()
+                        (list "--path" #$device)))
+                #:log-file "/var/log/qemu-ga.log"))
+      (stop #~(make-kill-destructor))))))
 
-)
 
 (define qemu-guest-agent-service-type
   (service-type