diff --git a/debian/changelog b/debian/changelog
index 2c23eae..a7db264 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+virt-viewer (0.5.5-4) experimental; urgency=low
+
+  * Upload to experimental since recent libvirt and spice-gtk aren't
+    available in sid/wheezy.
+  * [1ed354b] Depend on newer libvirt (Closes: #701684)
+  * [450bfec] Depend on newer spice-gtk
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 02 Mar 2013 12:31:06 +0100
+
 virt-viewer (0.5.5-3) unstable; urgency=low
 
   * New upload
@@ -15,6 +24,20 @@
   * [5bf850a] Imported Upstream version 0.5.5 (Closes: #684725)
 
  -- Laurent Léonard <laurent@open-minds.org>  Wed, 20 Feb 2013 23:20:54 +0100
+
+virt-viewer (0.5.4-3) experimental; urgency=low
+
+  * [af14ec8] Fix ssh connection tunneling
+
+ -- Guido Günther <agx@sigxcpu.org>  Mon, 22 Oct 2012 22:40:32 +0200
+
+virt-viewer (0.5.4-2) experimental; urgency=low
+
+  * Upload to experimental
+  * [0029b1c] Enable spice support (Closes: #667565)
+  * [b139b7c] Drop unneeded build-deps
+
+ -- Guido Günther <agx@sigxcpu.org>  Wed, 26 Sep 2012 08:59:19 +0200
 
 virt-viewer (0.5.4-1) unstable; urgency=low
 
@@ -57,6 +80,12 @@
       upstream
 
  -- Laurent Léonard <laurent@open-minds.org>  Thu, 10 Nov 2011 09:01:35 +0100
+
+virt-viewer (0.4.1-4) experimental; urgency=low
+
+  * [0029b1c] Enable spice support
+
+ -- Guido Günther <agx@sigxcpu.org>  Fri, 02 Sep 2011 21:04:44 +0200
 
 virt-viewer (0.4.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index de4e2d9..e6fd3b4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@
 Build-Depends: cdbs,
  debhelper (>= 7),
  autotools-dev,
- libvirt-dev (>= 0.8.1),
+ libvirt-dev (>= 0.10),
  libgtk-vnc-2.0-dev,
+ libspice-client-gtk-3.0-dev (>= 0.17),
  libxml2-dev,
  libgtk-3-dev,
  autotools-dev,
diff --git a/debian/patches/0001-Fail-if-opening-the-connection-fails.patch b/debian/patches/0001-Fail-if-opening-the-connection-fails.patch
new file mode 100644
index 0000000..53c7a34
--- /dev/null
+++ b/debian/patches/0001-Fail-if-opening-the-connection-fails.patch
@@ -0,0 +1,27 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Mon, 22 Oct 2012 20:05:24 +0200
+Subject: Fail if opening the connection fails
+
+instead of returning True. Which then fails with the misleading error
+
+(virt-viewer:18631): Gtk-WARNING **: Attempting to add a widget with type
+VncDisplay to a container of type VirtViewerDisplayVnc, but the widget is
+already inside a container of type VirtViewerDisplayVnc, please use
+gtk_widget_reparent()
+---
+ src/virt-viewer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/virt-viewer.c b/src/virt-viewer.c
+index 3143104..572e9e6 100644
+--- a/src/virt-viewer.c
++++ b/src/virt-viewer.c
+@@ -425,7 +425,7 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd)
+         DEBUG_LOG("Error %s", err && err->message ? err->message : "Unknown");
+         close(pair[0]);
+         close(pair[1]);
+-        return TRUE;
++        return FALSE;
+     }
+     close(pair[0]);
+     *fd = pair[1];
diff --git a/debian/patches/0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch b/debian/patches/0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
new file mode 100644
index 0000000..905a9cb
--- /dev/null
+++ b/debian/patches/0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
@@ -0,0 +1,25 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Mon, 22 Oct 2012 21:56:07 +0200
+Subject: Don't fail early if virDomainOpenGraphics fails
+
+virt_viewer_app_open_connection invokes virDomainOpenGraphics which only works
+for local connections. Returning after this failure makes us never reach the
+ssh part so this unbreaks connections tunneled over ssh.
+---
+ src/virt-viewer-app.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
+index def52c5..28dc8cb 100644
+--- a/src/virt-viewer-app.c
++++ b/src/virt-viewer-app.c
+@@ -820,8 +820,7 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
+     VirtViewerAppPrivate *priv = self->priv;
+     int fd = -1;
+ 
+-    if (!virt_viewer_app_open_connection(self, &fd))
+-        return -1;
++    virt_viewer_app_open_connection(self, &fd);
+ 
+     DEBUG_LOG("After open connection callback fd=%d", fd);
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c39d1b2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Fail-if-opening-the-connection-fails.patch
+0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
diff --git a/debian/rules b/debian/rules
index 95eadca..74fad81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_CONFIGURE_EXTRA_FLAGS := --with-gtk=3.0
+DEB_CONFIGURE_EXTRA_FLAGS := --with-gtk=3.0 --with-spice-gtk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk