diff --git a/srcpkgs/spice-vdagent/files/spice-vdagentd.rc b/srcpkgs/spice-vdagent/files/spice-vdagentd.rc
new file mode 100644
index 0000000000..792675dba5
--- /dev/null
+++ b/srcpkgs/spice-vdagent/files/spice-vdagentd.rc
@@ -0,0 +1,18 @@
+#!/sbin/runscript
+
+command=/sbin/spice-vdagentd
+description="Agent daemon for Spice guests"
+
+depend()
+{
+	need localmount dbus
+}
+
+start_pre()
+{
+	local vdagent_sock=/var/run/spice-vdagentd/spice-vdagent-sock
+
+	if [ -S $vdagent_sock ]; then
+		rm -f $vdagent_sock
+	fi
+}
diff --git a/srcpkgs/spice-vdagent/patches/Makefile-fixes.patch b/srcpkgs/spice-vdagent/patches/Makefile-fixes.patch
new file mode 100644
index 0000000000..4a33fb4b67
--- /dev/null
+++ b/srcpkgs/spice-vdagent/patches/Makefile-fixes.patch
@@ -0,0 +1,28 @@
+--- Makefile.orig	2011-02-21 21:24:40.916848965 +0100
++++ Makefile	2011-02-21 21:26:53.843354443 +0100
+@@ -23,23 +23,18 @@ install: build
+ 	install -d $(DESTDIR)$(socketdir)
+ 	install -p -m 755 spice-vdagent $(DESTDIR)$(bindir)
+ 	install -p -m 755 spice-vdagentd $(DESTDIR)$(sbindir)
+-	install -d $(DESTDIR)$(initdir)
+-	install -p -m 755 spice-vdagentd.sh $(DESTDIR)$(initdir)/spice-vdagentd
+ 	install -d $(DESTDIR)$(xdgautostartdir)
+-	install -d $(DESTDIR)$(gdmautostartdir)
+ 	desktop-file-install --dir=$(DESTDIR)$(xdgautostartdir) \
+ 		spice-vdagent.desktop
+-	desktop-file-install --dir=$(DESTDIR)$(gdmautostartdir) \
+-		spice-vdagent.desktop
+ 
+ clean:
+ 	rm -f $(TARGETS) *.o *~
+ 
+ spice-vdagentd: vdagentd.o vdagentd-uinput.o udscs.o vdagent-virtio-port.o console-kit.o
+-	$(CC) -o $@ $^ $(shell pkg-config --libs dbus-1)
++	$(CC) $(CFLAGS) $^ $(LDFLAGS) $(shell pkg-config --libs dbus-1) -o $@
+ 
+ spice-vdagent: vdagent.o vdagent-x11.o udscs.o
+-	$(CC) -o $@ $^ -lX11 -lXrandr -lXfixes
++	$(CC) $(CFLAGS) $^ $(LDFLAGS) -lX11 -lXrandr -lXfixes -o $@
+ 
+ tag:
+ 	@git tag -a -m "Tag as spice-vdagent-$(VERSION)" spice-vdagent-$(VERSION)
diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template
new file mode 100644
index 0000000000..7ddfbd764b
--- /dev/null
+++ b/srcpkgs/spice-vdagent/template
@@ -0,0 +1,41 @@
+# Template file for 'spice-vdagent'
+pkgname=spice-vdagent
+version=0.6.3
+distfiles="http://www.spicespace.org/download/releases/$pkgname-$version.tar.bz2"
+build_style=gnu_makefile
+short_desc="Spice agent for Linux"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=6553254b1b73cc2f2ff9ca4c1f4986b7efefca264158a16301098421bdae2498
+long_desc="
+Features:
+ * Client mouse mode (no need to grab mouse by client, no mouse lag)
+   this is handled by the daemon by feeding mouse events into the kernel
+   via uinput. This will only work if the active X-session is running a
+   spice-vdagent process so that its resolution can be determined.
+ * Automatic adjustment of the X-session resolution to the client resolution
+ * Support of copy and paste (text and images) between the active X-session
+   and the client"
+
+keep_empty_dirs=yes
+openrc_services="${pkgname}d default true"
+
+Add_dependency run glibc
+Add_dependency run dbus-libs
+Add_dependency run libXfixes
+Add_dependency run libX11
+Add_dependency run libXrandr
+Add_dependency build pkg-config
+Add_dependency build desktop-file-utils
+Add_dependency build dbus-devel
+Add_dependency build libXfixes-devel
+Add_dependency build libX11-devel
+Add_dependency build libXrandr-devel
+Add_dependency full dbus
+Add_dependency full ConsoleKit-x11
+
+post_install()
+{
+	# Install the OpenRC service.
+	install -D -m755 ${FILESDIR}/${pkgname}d.rc \
+		${DESTDIR}/etc/init.d/${pkgname}d
+}