diff --git a/gvfs-1.6.6.tar.bz2 b/gvfs-1.6.6.tar.bz2
deleted file mode 100644
index f050482..0000000
--- a/gvfs-1.6.6.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
-size 1387796
diff --git a/gvfs-1.8.0.tar.bz2 b/gvfs-1.8.0.tar.bz2
new file mode 100644
index 0000000..67e8f25
--- /dev/null
+++ b/gvfs-1.8.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45e741fdb7c7a9b4d6605851429775a1e9e7262506a4bd7b353c3b0d857c3626
+size 1414312
diff --git a/gvfs-dav-recursive-directory-ops.patch b/gvfs-dav-recursive-directory-ops.patch
index a332ea4..23b331f 100644
--- a/gvfs-dav-recursive-directory-ops.patch
+++ b/gvfs-dav-recursive-directory-ops.patch
@@ -4,19 +4,19 @@ Date:   Thu Jan 13 18:04:58 2011 +0100
 
     Patch 8: gvfs-dav-recursive-directory-ops.patch
 
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 39369b4..767eeb6 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -430,6 +430,7 @@ gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(HAL_LIBS)
+Index: gvfs-1.7.3/daemon/Makefile.am
+===================================================================
+--- gvfs-1.7.3.orig/daemon/Makefile.am
++++ gvfs-1.7.3/daemon/Makefile.am
+@@ -438,6 +438,7 @@ gvfsd_gphoto2_LDADD = $(libraries) $(GPH
  endif
  
  gvfsd_http_SOURCES = \
 +	gmempipe.c gmempipe.h \
  	soup-input-stream.c soup-input-stream.h \
- 	soup-output-stream.c soup-output-stream.h \
  	gvfsbackendhttp.c gvfsbackendhttp.h \
-@@ -474,6 +475,7 @@ gvfsd_nvvfs_LDADD = $(libraries)
+ 	daemon-main.c daemon-main.h \
+@@ -481,6 +482,7 @@ gvfsd_nvvfs_LDADD = $(libraries)
  
  
  gvfsd_dav_SOURCES = \
@@ -24,11 +24,10 @@ index 39369b4..767eeb6 100644
  	soup-input-stream.c soup-input-stream.h \
  	soup-output-stream.c soup-output-stream.h \
  	gvfsbackendhttp.c gvfsbackendhttp.h \
-diff --git a/daemon/gmempipe.c b/daemon/gmempipe.c
-new file mode 100644
-index 0000000..3ceebd9
+Index: gvfs-1.7.3/daemon/gmempipe.c
+===================================================================
 --- /dev/null
-+++ b/daemon/gmempipe.c
++++ gvfs-1.7.3/daemon/gmempipe.c
 @@ -0,0 +1,716 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + *
@@ -746,11 +745,10 @@ index 0000000..3ceebd9
 +  stream_class->write_fn = g_mem_pipe_output_stream_write;
 +  stream_class->close_fn = g_mem_pipe_output_stream_close;
 +}
-diff --git a/daemon/gmempipe.h b/daemon/gmempipe.h
-new file mode 100644
-index 0000000..c9b1cd3
+Index: gvfs-1.7.3/daemon/gmempipe.h
+===================================================================
 --- /dev/null
-+++ b/daemon/gmempipe.h
++++ gvfs-1.7.3/daemon/gmempipe.h
 @@ -0,0 +1,86 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
@@ -838,11 +836,11 @@ index 0000000..c9b1cd3
 +G_END_DECLS
 +
 +#endif /* __G_MEM_PIPE_H__ */
-diff --git a/daemon/gvfsbackenddav.c b/daemon/gvfsbackenddav.c
-index 95dc428..0862249 100644
---- a/daemon/gvfsbackenddav.c
-+++ b/daemon/gvfsbackenddav.c
-@@ -2313,6 +2313,47 @@ try_unmount (GVfsBackend    *backend,
+Index: gvfs-1.7.3/daemon/gvfsbackenddav.c
+===================================================================
+--- gvfs-1.7.3.orig/daemon/gvfsbackenddav.c
++++ gvfs-1.7.3/daemon/gvfsbackenddav.c
+@@ -2311,6 +2311,47 @@ try_unmount (GVfsBackend    *backend,
    _exit (0);
  }
  
@@ -890,7 +888,7 @@ index 95dc428..0862249 100644
  /* ************************************************************************* */
  /*  */
  static void
-@@ -2326,6 +2367,8 @@ g_vfs_backend_dav_class_init (GVfsBackendDavClass *klass)
+@@ -2324,6 +2365,8 @@ g_vfs_backend_dav_class_init (GVfsBacken
  
    backend_class = G_VFS_BACKEND_CLASS (klass); 
  
@@ -899,11 +897,11 @@ index 95dc428..0862249 100644
    backend_class->try_mount         = NULL;
    backend_class->mount             = do_mount;
    backend_class->try_query_info    = NULL;
-diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
-index 976e0ed..8534d83 100644
---- a/daemon/gvfsbackendhttp.c
-+++ b/daemon/gvfsbackendhttp.c
-@@ -239,7 +239,6 @@ http_error_code_from_status (guint status)
+Index: gvfs-1.7.3/daemon/gvfsbackendhttp.c
+===================================================================
+--- gvfs-1.7.3.orig/daemon/gvfsbackendhttp.c
++++ gvfs-1.7.3/daemon/gvfsbackendhttp.c
+@@ -239,7 +239,6 @@ http_error_code_from_status (guint statu
    return G_IO_ERROR_FAILED;
  }
  
@@ -911,7 +909,7 @@ index 976e0ed..8534d83 100644
  static void
  g_vfs_job_failed_from_http_status (GVfsJob *job, guint status_code, const char *message)
  {
-@@ -262,6 +261,16 @@ g_vfs_job_failed_from_http_status (GVfsJob *job, guint status_code, const char *
+@@ -262,6 +261,16 @@ g_vfs_job_failed_from_http_status (GVfsJ
    }
  }
  
@@ -988,7 +986,7 @@ index 976e0ed..8534d83 100644
  
    op_backend = G_VFS_BACKEND_HTTP (backend);
    uri = http_backend_uri_for_filename (backend, filename, FALSE);
-@@ -390,125 +363,119 @@ try_open_for_read (GVfsBackend        *backend,
+@@ -390,125 +363,119 @@ try_open_for_read (GVfsBackend        *b
  
    soup_message_body_set_accumulate (msg->response_body, FALSE);
  
@@ -1040,7 +1038,8 @@ index 976e0ed..8534d83 100644
 -  GVfsJob      *job;
    GError       *error;
 -  gssize        nread;
--
++  gssize        n_bytes;
+ 
 -  stream = G_INPUT_STREAM (source_object); 
 -  error  = NULL;
 -  job    = G_VFS_JOB (user_data);
@@ -1053,8 +1052,7 @@ index 976e0ed..8534d83 100644
 -                               error->domain,
 -                               error->code,
 -                               error->message);
-+  gssize        n_bytes;
- 
+-
 -     g_error_free (error);
 -     return;
 -   }
@@ -1089,9 +1087,9 @@ index 976e0ed..8534d83 100644
 -          gsize               bytes_requested)
 -{
 -  GInputStream    *stream;
- 
--  stream = G_INPUT_STREAM (handle);
 -
+-  stream = G_INPUT_STREAM (handle);
+ 
 -  g_input_stream_read_async (stream,
 -                             buffer,
 -                             bytes_requested,
@@ -1189,7 +1187,7 @@ index 976e0ed..8534d83 100644
        g_error_free (error);
      }
    else
-@@ -517,24 +484,6 @@ close_read_ready (GObject      *source_object,
+@@ -517,24 +484,6 @@ close_read_ready (GObject      *source_o
    g_object_unref (stream);
  }
  
@@ -1214,7 +1212,7 @@ index 976e0ed..8534d83 100644
  /* *** query_info () *** */
  
  static void
-@@ -688,10 +637,12 @@ g_vfs_backend_http_class_init (GVfsBackendHttpClass *klass)
+@@ -688,10 +637,12 @@ g_vfs_backend_http_class_init (GVfsBacke
    backend_class = G_VFS_BACKEND_CLASS (klass); 
  
    backend_class->try_mount              = try_mount;
@@ -1231,10 +1229,10 @@ index 976e0ed..8534d83 100644
    backend_class->try_query_info         = try_query_info;
    backend_class->try_query_info_on_read = try_query_info_on_read;
  }
-diff --git a/daemon/soup-input-stream.c b/daemon/soup-input-stream.c
-index e1928af..10af4dd 100644
---- a/daemon/soup-input-stream.c
-+++ b/daemon/soup-input-stream.c
+Index: gvfs-1.7.3/daemon/soup-input-stream.c
+===================================================================
+--- gvfs-1.7.3.orig/daemon/soup-input-stream.c
++++ gvfs-1.7.3/daemon/soup-input-stream.c
 @@ -18,7 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */
@@ -1252,7 +1250,7 @@ index e1928af..10af4dd 100644
  
  static void soup_input_stream_seekable_iface_init (GSeekableIface *seekable_iface);
  
-@@ -37,29 +38,23 @@ G_DEFINE_TYPE_WITH_CODE (SoupInputStream, soup_input_stream, G_TYPE_INPUT_STREAM
+@@ -37,29 +38,23 @@ G_DEFINE_TYPE_WITH_CODE (SoupInputStream
  
  typedef void (*SoupInputStreamCallback) (GInputStream *);
  
@@ -1271,27 +1269,29 @@ index e1928af..10af4dd 100644
 -  SoupInputStreamCallback got_chunk_cb;
 -  SoupInputStreamCallback finished_cb;
 -  SoupInputStreamCallback cancelled_cb;
-+  GMutex *lock;
-+  GCond  *cond;
-+  
-+  GMemPipe *mem_pipe;
- 
+-
 -  guchar *leftover_buffer;
 -  gsize leftover_bufsize, leftover_offset;
-+  GInputStream  *in;
-+  GOutputStream *out;
- 
+-
 -  guchar *caller_buffer;
 -  gsize caller_bufsize, caller_nread;
 -  GAsyncReadyCallback outstanding_callback;
 -  GSimpleAsyncResult *result;
++  GMutex *lock;
++  GCond  *cond;
++  
++  GMemPipe *mem_pipe;
++
++  GInputStream  *in;
++  GOutputStream *out;
++
 +};
  
 -} SoupInputStreamPrivate;
  #define SOUP_INPUT_STREAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SOUP_TYPE_INPUT_STREAM, SoupInputStreamPrivate))
  
  
-@@ -71,24 +66,6 @@ static gssize   soup_input_stream_read         (GInputStream         *stream,
+@@ -71,24 +66,6 @@ static gssize   soup_input_stream_read
  static gboolean soup_input_stream_close        (GInputStream         *stream,
  						GCancellable         *cancellable,
  						GError              **error);
@@ -1316,18 +1316,13 @@ index e1928af..10af4dd 100644
  
  static goffset  soup_input_stream_tell         (GSeekable            *seekable);
    
-@@ -115,13 +92,25 @@ soup_input_stream_finalize (GObject *object)
+@@ -115,13 +92,25 @@ soup_input_stream_finalize (GObject *obj
    SoupInputStream *stream = SOUP_INPUT_STREAM (object);
    SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
  
 -  g_object_unref (priv->session);
 +  g_print ("Finalize\n");
- 
--  g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_input_stream_got_headers), stream);
--  g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_input_stream_got_chunk), stream);
--  g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_input_stream_finished), stream);
--  g_object_unref (priv->msg);
--  g_free (priv->leftover_buffer);
++
 +  if (priv->session)
 +    g_object_unref (priv->session);
 +
@@ -1343,12 +1338,17 @@ index e1928af..10af4dd 100644
 +
 +  g_mutex_free (priv->lock);
 +  g_cond_free (priv->cond);
-+
+ 
+-  g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_input_stream_got_headers), stream);
+-  g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_input_stream_got_chunk), stream);
+-  g_signal_handlers_disconnect_by_func (priv->msg, G_CALLBACK (soup_input_stream_finished), stream);
+-  g_object_unref (priv->msg);
+-  g_free (priv->leftover_buffer);
 +  g_print ("Done!\n");
  
    if (G_OBJECT_CLASS (soup_input_stream_parent_class)->finalize)
      (*G_OBJECT_CLASS (soup_input_stream_parent_class)->finalize) (object);
-@@ -136,41 +125,77 @@ soup_input_stream_class_init (SoupInputStreamClass *klass)
+@@ -136,41 +125,77 @@ soup_input_stream_class_init (SoupInputS
    g_type_class_add_private (klass, sizeof (SoupInputStreamPrivate));
    
    gobject_class->finalize = soup_input_stream_finalize;
@@ -1439,7 +1439,7 @@ index e1928af..10af4dd 100644
  }
  
  /**
-@@ -181,21 +206,8 @@ soup_input_stream_queue_message (SoupInputStream *stream)
+@@ -181,21 +206,8 @@ soup_input_stream_queue_message (SoupInp
   * Prepares to send @msg over @session, and returns a #GInputStream
   * that can be used to read the response.
   *
@@ -1462,7 +1462,7 @@ index e1928af..10af4dd 100644
   *
   * Returns: a new #GInputStream.
   **/
-@@ -211,17 +223,15 @@ soup_input_stream_new (SoupSession *session, SoupMessage *msg)
+@@ -211,17 +223,15 @@ soup_input_stream_new (SoupSession *sess
    priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
  
    priv->session = g_object_ref (session);
@@ -1484,7 +1484,7 @@ index e1928af..10af4dd 100644
    return G_INPUT_STREAM (stream);
  }
  
-@@ -230,6 +240,8 @@ soup_input_stream_got_headers (SoupMessage *msg, gpointer stream)
+@@ -230,6 +240,8 @@ soup_input_stream_got_headers (SoupMessa
  {
    SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
  
@@ -1493,7 +1493,7 @@ index e1928af..10af4dd 100644
    /* If the status is unsuccessful, we just ignore the signal and let
     * libsoup keep going (eventually either it will requeue the request
     * (after handling authentication/redirection), or else the
-@@ -239,19 +251,14 @@ soup_input_stream_got_headers (SoupMessage *msg, gpointer stream)
+@@ -239,19 +251,14 @@ soup_input_stream_got_headers (SoupMessa
      return;
  
    priv->got_headers = TRUE;
@@ -1518,14 +1518,20 @@ index e1928af..10af4dd 100644
  {
    SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
    const gchar *chunk = chunk_buffer->data;
-@@ -263,46 +270,14 @@ soup_input_stream_got_chunk (SoupMessage *msg, SoupBuffer *chunk_buffer,
+@@ -263,46 +270,14 @@ soup_input_stream_got_chunk (SoupMessage
    if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code))
      return;
  
 -  /* Sanity check */
 -  if (priv->caller_bufsize == 0 || priv->leftover_bufsize != 0)
 -    g_warning ("soup_input_stream_got_chunk called again before previous chunk was processed");
--
++  g_output_stream_write_all (priv->out,
++			     chunk,
++			     chunk_size,
++			     NULL,
++			     NULL,
++			     NULL);
+ 
 -  /* Copy what we can into priv->caller_buffer */
 -  if (priv->caller_bufsize - priv->caller_nread > 0)
 -    {
@@ -1558,13 +1564,7 @@ index e1928af..10af4dd 100644
 -	  priv->leftover_offset = 0;
 -	}
 -    }
-+  g_output_stream_write_all (priv->out,
-+			     chunk,
-+			     chunk_size,
-+			     NULL,
-+			     NULL,
-+			     NULL);
- 
+-
 -  soup_session_pause_message (priv->session, msg);
 -  if (priv->got_chunk_cb)
 -    priv->got_chunk_cb (stream);
@@ -1572,7 +1572,7 @@ index e1928af..10af4dd 100644
  }
  
  static void
-@@ -310,71 +285,12 @@ soup_input_stream_finished (SoupMessage *msg, gpointer stream)
+@@ -310,71 +285,12 @@ soup_input_stream_finished (SoupMessage
  {
    SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
  
@@ -1649,7 +1649,7 @@ index e1928af..10af4dd 100644
  }
  
  static gboolean
-@@ -386,58 +302,10 @@ set_error_if_http_failed (SoupMessage *msg, GError **error)
+@@ -386,58 +302,10 @@ set_error_if_http_failed (SoupMessage *m
  			   msg->status_code, msg->reason_phrase);
        return TRUE;
      }
@@ -1709,7 +1709,7 @@ index e1928af..10af4dd 100644
  
  /**
   * soup_input_stream_send:
-@@ -454,54 +322,59 @@ soup_input_stream_send_internal (GInputStream  *stream,
+@@ -454,54 +322,59 @@ soup_input_stream_send_internal (GInputS
   * not.
   **/
  gboolean
@@ -1761,21 +1761,21 @@ index e1928af..10af4dd 100644
 +                        GError       **error)
  {
 -  SoupInputStreamPrivate *priv = SOUP_INPUT_STREAM_GET_PRIVATE (stream);
--
--  if (priv->finished)
--    return 0;
 +  SoupInputStream        *istream;
 +  SoupInputStreamPrivate *priv;
 +  gssize nread;
  
--  /* If there is data leftover from a previous read, return it. */
--  if (priv->leftover_bufsize)
--    return read_from_leftover (priv, buffer, count);
+-  if (priv->finished)
+-    return 0;
 +  g_return_val_if_fail (SOUP_IS_INPUT_STREAM (stream), -1);
 +  
 +  istream = SOUP_INPUT_STREAM (stream);
 +  priv = istream->priv;
  
+-  /* If there is data leftover from a previous read, return it. */
+-  if (priv->leftover_bufsize)
+-    return read_from_leftover (priv, buffer, count);
+-
 -  /* No leftover data, accept one chunk from the network */
 -  soup_input_stream_prepare_for_io (stream, cancellable, buffer, count);
 -  while (!priv->finished && priv->caller_nread == 0 &&
@@ -1802,7 +1802,7 @@ index e1928af..10af4dd 100644
  }
  
  static gboolean
-@@ -509,314 +382,25 @@ soup_input_stream_close (GInputStream *stream,
+@@ -509,314 +382,25 @@ soup_input_stream_close (GInputStream *s
  			 GCancellable *cancellable,
  			 GError      **error)
  {
@@ -2130,7 +2130,7 @@ index e1928af..10af4dd 100644
    return TRUE;
  }
  
-@@ -834,17 +418,17 @@ soup_input_stream_can_seek (GSeekable *seekable)
+@@ -834,17 +418,17 @@ soup_input_stream_can_seek (GSeekable *s
    return TRUE;
  }
  
@@ -2154,7 +2154,7 @@ index e1928af..10af4dd 100644
    char *range;
  
    if (type == G_SEEK_END)
-@@ -862,8 +446,7 @@ soup_input_stream_seek (GSeekable     *seekable,
+@@ -862,8 +446,7 @@ soup_input_stream_seek (GSeekable     *s
    if (!g_input_stream_set_pending (stream, error))
        return FALSE;
  
@@ -2164,7 +2164,7 @@ index e1928af..10af4dd 100644
  
    switch (type)
      {
-@@ -889,7 +472,7 @@ soup_input_stream_seek (GSeekable     *seekable,
+@@ -889,7 +472,7 @@ soup_input_stream_seek (GSeekable     *s
    soup_message_headers_append (priv->msg->request_headers, "Range", range);
    g_free (range);
  
@@ -2173,7 +2173,7 @@ index e1928af..10af4dd 100644
  
    g_input_stream_clear_pending (stream);
    return TRUE;
-@@ -922,8 +505,8 @@ soup_input_stream_get_message (GInputStream *stream)
+@@ -922,8 +505,8 @@ soup_input_stream_get_message (GInputStr
  GQuark
  soup_http_error_quark (void)
  {
@@ -2186,10 +2186,10 @@ index e1928af..10af4dd 100644
 +    error = g_quark_from_static_string ("soup_http_error_quark");
 +  return error;
  }
-diff --git a/daemon/soup-input-stream.h b/daemon/soup-input-stream.h
-index f425291..2d47c7c 100644
---- a/daemon/soup-input-stream.h
-+++ b/daemon/soup-input-stream.h
+Index: gvfs-1.7.3/daemon/soup-input-stream.h
+===================================================================
+--- gvfs-1.7.3.orig/daemon/soup-input-stream.h
++++ gvfs-1.7.3/daemon/soup-input-stream.h
 @@ -33,17 +33,22 @@ G_BEGIN_DECLS
  
  typedef struct SoupInputStream         SoupInputStream;
@@ -2213,7 +2213,7 @@ index f425291..2d47c7c 100644
    /* Padding for future expansion */
    void (*_g_reserved1) (void);
    void (*_g_reserved2) (void);
-@@ -61,15 +66,6 @@ gboolean      soup_input_stream_send        (GInputStream        *stream,
+@@ -61,15 +66,6 @@ gboolean      soup_input_stream_send
  					     GCancellable        *cancellable,
  					     GError             **error);
  
diff --git a/gvfs-dice-backend.patch b/gvfs-dice-backend.patch
index 4d1ec7e..830bfc4 100644
--- a/gvfs-dice-backend.patch
+++ b/gvfs-dice-backend.patch
@@ -2092,19 +2092,19 @@ Index: gvfs-1.5.5/daemon/Makefile.am
 -	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
 +	$(GLIB_LIBS) $(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(KEYRING_LIBS)
  
- # D-BUS service file
- %.service: %.service.in ../config.log
+ gvfs_gschemas =
+ gvfs_gschemas_convert =
 @@ -37,10 +38,10 @@ service_DATA = gvfs-daemon.service
  %.mount: %.mount.in ../config.log
  	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
  
--libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp
-+libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-dice
+-libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
++libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network gvfsd-dice
  
--mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in
--mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount
-+mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in dice.mount.in
-+mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount dice.mount
+-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
+-mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
++mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in dice.mount.in
++mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount dice.mount
  
  mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in 
  if HAVE_HTTP
diff --git a/gvfs-glib-2.27.patch b/gvfs-glib-2.27.patch
deleted file mode 100644
index 160eb52..0000000
--- a/gvfs-glib-2.27.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 6115bf7549fc2a9171d7cd5eaec6bc1a58dfb8b2
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Fri Nov 19 10:00:36 2010 +0100
-
-    Do not build app lookup extension if we have glib >= 2.27.1
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=635252
-
-diff --git a/configure.ac b/configure.ac
-index ed70e54..5f05f57 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -213,6 +213,14 @@ fi
- 
- AM_CONDITIONAL(USE_GCONF, [test "$msg_gconf" = "yes"])
- 
-+dnl *************************************************************
-+dnl *** Check if we can build gconf-based gio extension point ***
-+dnl *************************************************************
-+
-+msg_gconf_gio=no
-+PKG_CHECK_EXISTS(gio-2.0 <= 2.27.1, msg_gconf_gio=yes)
-+AM_CONDITIONAL(USE_GCONF_GIO, [test "$msg_gconf_gio" = "yes"])
-+
- dnl ********************************************
- dnl *** Check for expat (for obexftp and gdu ***
- dnl ********************************************
-@@ -726,6 +734,7 @@ echo "
- 	archive support:              $msg_archive
- 	AFC support:                  $msg_afc
-         GConf support:                $msg_gconf
-+        GConf-based GIO extension:    $msg_gconf_gio
-         DNS-SD support:               $msg_avahi
- 	Build HAL volume monitor:     $msg_hal (with fast init path: $have_hal_fast_init)
- 	Build GDU volume monitor:     $msg_gdu
-diff --git a/gconf/Makefile.am b/gconf/Makefile.am
-index 85d4d8d..af1433e 100644
---- a/gconf/Makefile.am
-+++ b/gconf/Makefile.am
-@@ -4,8 +4,10 @@ NULL =
- module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
- 
- if USE_GCONF
-+if USE_GCONF_GIO
- giomodules_LTLIBRARIES = libgiogconf.la
- endif
-+endif
- 
- libgiogconf_la_SOURCES =				\
- 	gapplookupgconf.c gapplookupgconf.h		\
diff --git a/gvfs-nds.patch b/gvfs-nds.patch
index 4e6ca20..9f5b0ba 100644
--- a/gvfs-nds.patch
+++ b/gvfs-nds.patch
@@ -826,9 +826,9 @@ Index: gvfs-1.5.4/daemon/Makefile.am
 +mount_DATA += nds.mount
 +libexec_PROGRAMS += gvfsd-nds
 +
- EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
- 
- DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
+ EXTRA_DIST = 				\
+ 	gvfs-daemon.service.in		\
+ 	$(mount_in_files)		\
 @@ -442,6 +446,19 @@ gvfsd_http_CPPFLAGS = \
  
  gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
diff --git a/gvfs-nvvfs.patch b/gvfs-nvvfs.patch
index 101ad75..bcd971f 100644
--- a/gvfs-nvvfs.patch
+++ b/gvfs-nvvfs.patch
@@ -661,9 +661,9 @@ Index: gvfs-1.5.1/daemon/Makefile.am
 +mount_DATA += nvvfs.mount
 +libexec_PROGRAMS += gvfsd-nvvfs
 +
- EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
- 
- DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
+ EXTRA_DIST = 				\
+ 	gvfs-daemon.service.in		\
+ 	$(mount_in_files)		\
 @@ -438,6 +442,20 @@ gvfsd_http_CPPFLAGS = \
  
  gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
diff --git a/gvfs.changes b/gvfs.changes
index 5e64b75..24add19 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Apr  5 11:55:02 UTC 2011 - fcrozat@novell.com
+
+- Update to version 1.8.0:
+  + afc: Fix renaming files moving them to the root dir
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar 21 16:49:05 UTC 2011 - fcrozat@novell.com
+
+- Update to version 1.7.3!
+  + build: Bump fuse requirement for ATOMIC_O_TRUNC support
+  + build: Honor ACLOCAL_FLAGS
+  + build: Don't link http backend with SoupOutputStream
+  + build: Cleanups and fixes for compiler warnings
+  + client: Fix wrong assignment before dbus_connection_unref()
+  + archive: Prevent assertion failure on duplicate mount
+  + archive: Skip leading "./" from pathnames if present
+  + archive: Propagate entry index as inode no. for files
+  + smb: Add support for default location
+  + Updated translations.
+
 -------------------------------------------------------------------
 Thu Mar 10 11:09:26 CET 2011 - vuntz@opensuse.org
 
@@ -5,12 +27,52 @@ Thu Mar 10 11:09:26 CET 2011 - vuntz@opensuse.org
   dbus .service files with their appropriate daemons, to avoid
   declaring a dbus service if the binary is not installed.
 
+-------------------------------------------------------------------
+Mon Feb 28 11:11:32 UTC 2011 - fcrozat@novell.com
+
+- Update to version 1.7.2:
+  + ftp: Parse mode, user and group for unix listings
+  + ftp: Implement chmod
+  + sftp: Catch invalid argument type for chmod command
+  + smb: Catch invalid argument type when setting mtime
+  + Updated translations.
+- Changes from version 1.7.1:
+  + ftp: Fix refcounting of addresses when connecting
+  + ftp: Detect TLS and SSL support
+  + afc: Add ability to mount the house-arrest service
+  + afc: Add support for House Arrest protocol to access
+         the Documents/ folder within applications
+  + Fix gvfs client code on ARM platform
+  + Various build issues fixed
+  + Updated translations.
+
 -------------------------------------------------------------------
 Thu Jan 13 18:31:47 CET 2011 - hpj@novell.com
 
 - Add gvfs-dav-recursive-directory-ops.patch (bnc#395225). This
   makes copying directories over WebDAV work.
 
+-------------------------------------------------------------------
+Thu Dec 16 17:40:53 CET 2010 - vuntz@opensuse.org
+
+- Update to version 1.7.0:
+  + sftp: Close pty master in child process to prevent SELinux
+    denial
+  + fuse: Add proper truncate support for open()
+  + Port to GSettings
+  + gdu: Treat mounts as hidden if they have a path element
+    that starts with a dot
+  + Updated translations.
+- Drop gvfs-glib-2.27.patch: this is not needed anymore.
+- Rebase gvfs-dice-backend.patch, gvfs-nds.patch and
+  gvfs-nvvfs.patch.
+- Remove gconf2-devel BuildRequires.
+- Remove check for openSUSE 11.1 and earlier: we won't support 11.1
+  anymore.
+- Handle gsettings schemas: add %glib2_gsettings_schema_requires
+  for gvfs-backends, and %glib2_gsettings_schema_post(un) in the
+  gvfs-backends scriptlets.
+
 -------------------------------------------------------------------
 Mon Dec  6 16:10:56 CET 2010 - vuntz@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index 47d7ed2..f0154e8 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -18,8 +18,8 @@
 
 
 Name:           gvfs
-Version:        1.6.6
-Release:        3
+Version:        1.8.0
+Release:        1
 License:        LGPLv2.0+
 Summary:        VFS functionality for GLib
 Url:            http://www.gnome.org
@@ -32,33 +32,28 @@ Patch1:         gvfs-dice-backend.patch
 Patch5:         gvfs-nvvfs.patch
 # PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
 Patch6:         gvfs-nds.patch
-# PATCH-FIX-UPSTREAM gvfs-glib-2.27.patch bgo#635252 vuntz@opensuse.org -- Fix build with recent glib
-Patch7:         gvfs-glib-2.27.patch
 # PATCH-FIX-UPSTREAM gvfs-dav-recursive-directory-ops.patch bnc#395225 bgo#551339 hpj@novell.com -- Make DAV recursive copy/move work, taken from http://gitorious.org/lanedo/gvfs/commits/dav_sync_io
 Patch8:         gvfs-dav-recursive-directory-ops.patch
 BuildRequires:  bluez-devel
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fuse-devel
-BuildRequires:  gconf2-devel
 BuildRequires:  glib2-devel
 BuildRequires:  intltool
 BuildRequires:  libarchive-devel
 BuildRequires:  libavahi-glib-devel
 BuildRequires:  libcdio-devel
 BuildRequires:  libexpat-devel
+BuildRequires:  libgdu-devel
 BuildRequires:  libgnome-keyring-devel
 BuildRequires:  libgphoto2-devel
+BuildRequires:  libgudev-1_0-devel
 BuildRequires:  libimobiledevice-devel
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  pkg-config
 BuildRequires:  translation-update-upstream
-%if %suse_version > 1110
-BuildRequires:  libgdu-devel
-BuildRequires:  libgudev-1_0-devel
-%endif
-Recommends:     %{name}-lang
 Requires:       libgvfscommon0 = %{version}
+Recommends:     %{name}-lang
 Recommends:     gvfs-backends
 Recommends:     gvfs-common
 Recommends:     gvfs-fuse
@@ -93,6 +88,7 @@ Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
 Recommends:     gvfs-backend-afc
 Recommends:     obex-data-server
+%glib2_gsettings_schema_requires
 
 %description backends
 VFS functionality for GLib.
@@ -123,12 +119,11 @@ translation-update-upstream
 %patch1 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
-
-%build
 autoreconf -f
 libtoolize -c -f
+
+%build
 %configure \
     --libexecdir=%{_libexecdir}/%{name} \
     --disable-static
@@ -151,6 +146,12 @@ chmod -x %{buildroot}%{_sysconfdir}/profile.d/*
 %postun
 %glib2_gio_module_postun
 
+%post backends
+%glib2_gsettings_schema_post
+
+%postun backends
+%glib2_gsettings_schema_postun
+
 %post -n libgvfscommon0 -p /sbin/ldconfig
 
 %postun -n libgvfscommon0 -p /sbin/ldconfig
@@ -235,6 +236,15 @@ rm -rf %{buildroot}
 # gvfsd-trash is GPLv3 because of trashlib.
 %{_libexecdir}/%{name}/gvfsd-trash
 %{_datadir}/%{name}/mounts/trash.mount
+# GSettings schemas & conversion data
+# Those schemas are used by gvfsd-network & gvfsd-smb
+%{_datadir}/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
+%dir %{_datadir}/GConf
+%dir %{_datadir}/GConf/gsettings
+%{_datadir}/GConf/gsettings/gvfs-dns-sd.convert
+%{_datadir}/GConf/gsettings/gvfs-smb.convert
 
 %files -n libgvfscommon0
 %defattr(-, root, root)