diff --git a/cerbero/utils/git.py b/cerbero/utils/git.py
index 53717d72..f314a246 100644
--- a/cerbero/utils/git.py
+++ b/cerbero/utils/git.py
@@ -109,7 +109,7 @@ def fetch(git_dir, fail=True):
     @param fail: raise an error if the command failed
     @type fail: false
     '''
-    return shell.call('%s fetch --all' % GIT, git_dir, fail=fail)
+    return shell.call('%s fetch --tags' % GIT, git_dir, fail=fail)
 
 def submodules_update(git_dir, src_dir=None, fail=True):
     '''
diff --git a/recipes/spice-gtk.recipe b/recipes/spice-gtk.recipe
index 614e244c..3dd707aa 100644
--- a/recipes/spice-gtk.recipe
+++ b/recipes/spice-gtk.recipe
@@ -3,8 +3,8 @@
 class Recipe(recipe.Recipe):
     name = 'spice-gtk'
     version = '0.29-flexvdi'
-    remotes = {'origin': 'https://github.com/flexVDI/spice-gtk.git'}
-    commit = 'v0.29-fv5'
+    remotes = {'origin': 'https://github.com/fireforge1982/spice-gtk.git'}
+    commit = 'v0.29-fv5-nonopoll'
     # either LGPLv2.1 or MPLv1.1
     licenses = [License.LGPLv2_1]
     autoreconf = True 
diff --git a/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch b/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch
index 4d0e0804..f7e476e0 100644
--- a/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch
+++ b/recipes/spice-gtk/0003-Remove-spice_usb_device_get_libusb_device-symbol-fro.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 1/3] Remove spice_usb_device_get_libusb_device symbol from
  map-file.
 
 ---
- gtk/map-file | 1 -
+ src/map-file | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/gtk/map-file b/gtk/map-file
+diff --git a/src/map-file b/src/map-file
 index 2a8be87..ca5a29d 100644
---- a/gtk/map-file
-+++ b/gtk/map-file
+--- a/src/map-file
++++ b/src/map-file
 @@ -117,7 +117,6 @@ spice_uri_set_scheme;
  spice_uri_set_user;
  spice_uri_to_string;
diff --git a/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch b/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch
index 530f444f..4f0115c0 100644
--- a/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch
+++ b/recipes/spice-gtk/0004-Remove-spice_usb_device_get_libusb_device-from-spice.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 2/3] Remove spice_usb_device_get_libusb_device from
  spice-glib-sym-file.
 
 ---
- gtk/spice-glib-sym-file | 1 -
+ src/spice-glib-sym-file | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
+diff --git a/src/spice-glib-sym-file b/src/spice-glib-sym-file
 index 3a8da93..6830cb1 100644
---- a/gtk/spice-glib-sym-file
-+++ b/gtk/spice-glib-sym-file
+--- a/src/spice-glib-sym-file
++++ b/src/spice-glib-sym-file
 @@ -92,7 +92,6 @@ spice_uri_set_scheme
  spice_uri_set_user
  spice_uri_to_string
diff --git a/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch b/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch
index 2f661d3c..f1452fef 100644
--- a/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch
+++ b/recipes/spice-gtk/0005-Remove-set_va_display_hook-symbol-from-linker-files.patch
@@ -4,14 +4,14 @@ Date: Thu, 14 Apr 2016 12:56:40 +0200
 Subject: [PATCH] Remove "set_va_display_hook" symbol from linker files.
 
 ---
- gtk/map-file            | 1 -
- gtk/spice-glib-sym-file | 1 -
+ src/map-file            | 1 -
+ src/spice-glib-sym-file | 1 -
  2 files changed, 2 deletions(-)
 
-diff --git a/gtk/map-file b/gtk/map-file
+diff --git a/src/map-file b/src/map-file
 index 4ef3dfe..f1323c9 100644
---- a/gtk/map-file
-+++ b/gtk/map-file
+--- a/src/map-file
++++ b/src/map-file
 @@ -137,7 +137,6 @@ spice_util_get_version_string;
  spice_util_set_debug;
  spice_uuid_to_string;
@@ -20,10 +20,10 @@ index 4ef3dfe..f1323c9 100644
  local:
  *;
  };
-diff --git a/gtk/spice-glib-sym-file b/gtk/spice-glib-sym-file
+diff --git a/src/spice-glib-sym-file b/src/spice-glib-sym-file
 index 83f7afb..dba28e0 100644
---- a/gtk/spice-glib-sym-file
-+++ b/gtk/spice-glib-sym-file
+--- a/src/spice-glib-sym-file
++++ b/src/spice-glib-sym-file
 @@ -110,4 +110,3 @@ spice_util_get_version_string
  spice_util_set_debug
  spice_uuid_to_string
diff --git a/recipes/spiceglue.recipe b/recipes/spiceglue.recipe
index efdb638f..d36eea94 100644
--- a/recipes/spiceglue.recipe
+++ b/recipes/spiceglue.recipe
@@ -4,8 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'spiceglue'
     version = '2.2'
-    commit = 'winClientv2.2.46'
-    remotes = {'origin': 'https://github.com/flexvdi/spiceglue'}
+    commit = 'winClientv2.2.44'
+    remotes = {'origin': 'https://github.com/fireforge1982/spiceglue'}
 
     autoreconf = True 
     autoreconf_sh = 'autoreconf -fiv'