diff --git a/gvfs-nds.patch b/gvfs-nds.patch
index a4210d1..bfe02f7 100644
--- a/gvfs-nds.patch
+++ b/gvfs-nds.patch
@@ -1,8 +1,7 @@
-Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
-===================================================================
---- /dev/null
-+++ gvfs-1.1.3/daemon/gvfsbackendnds.c
-@@ -0,0 +1,763 @@
+diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.c gvfs-1.2.0/daemon/gvfsbackendnds.c
+--- gvfs-1.2.0.orig/daemon/gvfsbackendnds.c	1970-01-01 05:30:00.000000000 +0530
++++ gvfs-1.2.0/daemon/gvfsbackendnds.c	2009-04-03 20:14:07.000000000 +0530
+@@ -0,0 +1,753 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
 + * Copyright (C) 2006-2007 Red Hat, Inc.
@@ -55,7 +54,6 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
 +
 +
 +
-+
 +typedef struct {
 +  char *name;
 +  char *name_normalized;
@@ -205,7 +203,10 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
 +  char *server_name=NULL;
 +  struct utsname utsbuf;
 +/* Function Pointer to /opt/novell/lib/libinterface.so */
-+int (*retrieve_children)(char *);
++  int (*retrieve_children)(char *,char ***,int *);
++  char **object_list_array=NULL;
++  int num_objects=0;
++  int i;
 +
 +  entries = NULL;
 +  entry_errno = 0;
@@ -251,28 +252,15 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
 +	}
 +	*(void **)(&retrieve_children) = dlsym(handle,"retrieve_children");
 +	
-+	unlink("/tmp/ndsobjects.txt");
-+
 +	if(retrieve_children != NULL)
 +	{	
-+	        res = (*retrieve_children)(server_name);
-+
-+         	if(res == 0)
++	        res = (*retrieve_children)(server_name,&object_list_array,&num_objects);
++		if(res == 0)
 +		{
-+			fptr = fopen("/tmp/ndsobjects.txt","r");
-+		        if(fptr == NULL)
-+		        {
-+        		        entry_errno = -1;
-+                		goto out;
-+       			}
-+			objectname = (char *)malloc(sizeof(char) * 400);
-+		        while (fgets(objectname,400,fptr) != NULL)
-+        		{
-+                		objectlist = g_list_append(objectlist,g_strdup(objectname));
-+		                memset(objectname,'\0',400);
-+        		}
-+	        	fclose(fptr);
-+		        free(objectname);
++			for(i=0;i < num_objects; i++)
++			{
++				objectlist = g_list_append(objectlist,g_strdup(*(object_list_array+ i)));
++			}
 +		}
 +	}	
 +	else
@@ -656,7 +644,7 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
 +		GFileAttributeMatcher *matcher)
 +{
 +  GVfsBackendNds *op_backend = G_VFS_BACKEND_NDS (backend);
-+  const char *icon_name;
++  const char *icon_name = NULL;
 +  GIcon *icon;
 +
 +  if (filename && is_root (filename))
@@ -664,7 +652,8 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
 +    g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY);
 +    g_file_info_set_name (info, "/");
 +    g_file_info_set_display_name (info, g_vfs_backend_get_display_name (backend));
-+    icon_name = g_vfs_backend_get_icon_name (backend);
++    /* FIXME: This API does not seem to be in gvfs-1.2.0. Find a suitable replacement? */
++    /* icon_name = g_vfs_backend_get_icon_name (backend); */
 +    if (icon_name)
 +    {
 +      icon = g_themed_icon_new (icon_name);
@@ -766,10 +755,9 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.c
 +{
 +  g_set_application_name (_("Displaying Embedded Objects"));
 +}
-Index: gvfs-1.1.3/daemon/gvfsbackendnds.h
-===================================================================
---- /dev/null
-+++ gvfs-1.1.3/daemon/gvfsbackendnds.h
+diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnds.h gvfs-1.2.0/daemon/gvfsbackendnds.h
+--- gvfs-1.2.0.orig/daemon/gvfsbackendnds.h	1970-01-01 05:30:00.000000000 +0530
++++ gvfs-1.2.0/daemon/gvfsbackendnds.h	2009-04-03 19:51:07.000000000 +0530
 @@ -0,0 +1,53 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
@@ -824,10 +812,9 @@ Index: gvfs-1.1.3/daemon/gvfsbackendnds.h
 +G_END_DECLS
 +
 +#endif /* __G_VFS_BACKEND_NDS_H__ */
-Index: gvfs-1.1.3/daemon/Makefile.am
-===================================================================
---- gvfs-1.1.3.orig/daemon/Makefile.am
-+++ gvfs-1.1.3/daemon/Makefile.am
+diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
+--- gvfs-1.2.0.orig/daemon/Makefile.am	2009-04-03 20:08:22.000000000 +0530
++++ gvfs-1.2.0/daemon/Makefile.am	2009-04-03 19:51:07.000000000 +0530
 @@ -105,6 +105,10 @@ mount_in_files += nvvfs.mount.in
  mount_DATA += nvvfs.mount
  libexec_PROGRAMS += gvfsd-nvvfs
@@ -839,7 +826,7 @@ Index: gvfs-1.1.3/daemon/Makefile.am
  EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
  
  DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
-@@ -403,6 +407,19 @@ gvfsd_http_CPPFLAGS = \
+@@ -406,6 +410,19 @@ gvfsd_http_CPPFLAGS = \
  
  gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
  
@@ -859,10 +846,9 @@ Index: gvfs-1.1.3/daemon/Makefile.am
  gvfsd_nvvfs_SOURCES = \
          gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
          daemon-main.c daemon-main.h \
-Index: gvfs-1.1.3/daemon/nds.mount.in
-===================================================================
---- /dev/null
-+++ gvfs-1.1.3/daemon/nds.mount.in
+diff -Nupr gvfs-1.2.0.orig/daemon/nds.mount.in gvfs-1.2.0/daemon/nds.mount.in
+--- gvfs-1.2.0.orig/daemon/nds.mount.in	1970-01-01 05:30:00.000000000 +0530
++++ gvfs-1.2.0/daemon/nds.mount.in	2009-04-03 19:51:07.000000000 +0530
 @@ -0,0 +1,5 @@
 +[Mount]
 +Type=nds
diff --git a/gvfs-nvvfs.patch b/gvfs-nvvfs.patch
index 52b0235..66b944e 100644
--- a/gvfs-nvvfs.patch
+++ b/gvfs-nvvfs.patch
@@ -1,7 +1,7 @@
-diff -Nurp gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.c gvfs-1.0.2/daemon/gvfsbackendnvvfs.c
---- gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.c	1970-01-01 05:30:00.000000000 +0530
-+++ gvfs-1.0.2/daemon/gvfsbackendnvvfs.c	2009-01-08 16:57:14.000000000 +0530
-@@ -0,0 +1,580 @@
+diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.c gvfs-1.2.0/daemon/gvfsbackendnvvfs.c
+--- gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.c	1970-01-01 05:30:00.000000000 +0530
++++ gvfs-1.2.0/daemon/gvfsbackendnvvfs.c	2009-04-03 20:04:20.000000000 +0530
+@@ -0,0 +1,591 @@
 +/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
@@ -322,13 +322,24 @@ diff -Nurp gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.c gvfs-1.0.2/daemon/gvfsbacken
 +
 +  file = g_slice_new0 (NovellNautilus);
 +  file->filename = g_strdup ("root.link");
-+  file->display_name = g_strdup (_("AvailableConnections"));
++  file->display_name = g_strdup (_("Available Connections"));
 +  file->icon = g_themed_icon_new("ncl-logo");
 +  file->root = g_file_new_for_path (path_ncl);
 +  file->prio = 0;
 +  
 +  files = g_list_prepend (files, file);
 +
++  file = g_slice_new0 (NovellNautilus);
++  file->filename = g_strdup ("root.lnk");
++  file->display_name = g_strdup (_("All Connections"));
++  file->icon = g_themed_icon_new("ncl-logo");
++  file->root = g_file_new_for_path (path_ncl);
++  file->prio = 0;
++
++  files = g_list_prepend (files, file);
++
++  files = g_list_reverse (files);
++
 +  files = g_list_sort (files, (GCompareFunc)sort_file_by_filename);
 +
 +  update_from_files (backend, files);
@@ -582,9 +593,9 @@ diff -Nurp gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.c gvfs-1.0.2/daemon/gvfsbacken
 +  backend_class->try_query_info = try_query_info;
 +  backend_class->try_enumerate = try_enumerate;
 +}
-diff -Nurp gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.h gvfs-1.0.2/daemon/gvfsbackendnvvfs.h
---- gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.h	1970-01-01 05:30:00.000000000 +0530
-+++ gvfs-1.0.2/daemon/gvfsbackendnvvfs.h	2009-01-08 15:49:22.000000000 +0530
+diff -Nupr gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.h gvfs-1.2.0/daemon/gvfsbackendnvvfs.h
+--- gvfs-1.2.0.orig/daemon/gvfsbackendnvvfs.h	1970-01-01 05:30:00.000000000 +0530
++++ gvfs-1.2.0/daemon/gvfsbackendnvvfs.h	2009-04-03 19:51:07.000000000 +0530
 @@ -0,0 +1,50 @@
 +/* GIO - GLib Input, Output and Streaming Library
 + * 
@@ -636,10 +647,10 @@ diff -Nurp gvfs-1.0.2_org/daemon/gvfsbackendnvvfs.h gvfs-1.0.2/daemon/gvfsbacken
 +G_END_DECLS
 +
 +#endif /* __G_VFS_BACKEND_NVVFS_H__ */
-diff -Nurp gvfs-1.0.2_org/daemon/Makefile.am gvfs-1.0.2/daemon/Makefile.am
---- gvfs-1.0.2_org/daemon/Makefile.am	2008-09-14 17:35:05.000000000 +0530
-+++ gvfs-1.0.2/daemon/Makefile.am	2009-01-08 15:51:44.000000000 +0530
-@@ -95,6 +95,10 @@ mount_DATA += archive.mount
+diff -Nupr gvfs-1.2.0.orig/daemon/Makefile.am gvfs-1.2.0/daemon/Makefile.am
+--- gvfs-1.2.0.orig/daemon/Makefile.am	2009-04-03 20:24:16.000000000 +0530
++++ gvfs-1.2.0/daemon/Makefile.am	2009-04-03 20:20:55.000000000 +0530
+@@ -101,6 +101,10 @@ mount_DATA += archive.mount
  libexec_PROGRAMS += gvfsd-archive
  endif
  
@@ -650,9 +661,9 @@ diff -Nurp gvfs-1.0.2_org/daemon/Makefile.am gvfs-1.0.2/daemon/Makefile.am
  EXTRA_DIST = gvfs-daemon.service.in $(mount_in_files) obexftp-marshal.list
  
  DISTCLEANFILES = gvfs-daemon.service $(mount_DATA)
-@@ -395,3 +399,17 @@ gvfsd_dav_CPPFLAGS = \
+@@ -402,6 +406,20 @@ gvfsd_http_CPPFLAGS = \
  
- gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS)
+ gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS)
  
 +gvfsd_nvvfs_SOURCES = \
 +        gvfsbackendnvvfs.c gvfsbackendnvvfs.h \
@@ -668,9 +679,12 @@ diff -Nurp gvfs-1.0.2_org/daemon/Makefile.am gvfs-1.0.2/daemon/Makefile.am
 +gvfsd_nvvfs_LDADD = $(libraries)
 +
 +
-diff -Nurp gvfs-1.0.2_org/daemon/nvvfs.mount.in gvfs-1.0.2/daemon/nvvfs.mount.in
---- gvfs-1.0.2_org/daemon/nvvfs.mount.in	1970-01-01 05:30:00.000000000 +0530
-+++ gvfs-1.0.2/daemon/nvvfs.mount.in	2009-01-08 15:49:32.000000000 +0530
+ gvfsd_dav_SOURCES = \
+ 	soup-input-stream.c soup-input-stream.h \
+ 	soup-output-stream.c soup-output-stream.h \
+diff -Nupr gvfs-1.2.0.orig/daemon/nvvfs.mount.in gvfs-1.2.0/daemon/nvvfs.mount.in
+--- gvfs-1.2.0.orig/daemon/nvvfs.mount.in	1970-01-01 05:30:00.000000000 +0530
++++ gvfs-1.2.0/daemon/nvvfs.mount.in	2009-04-03 19:51:07.000000000 +0530
 @@ -0,0 +1,5 @@
 +[Mount]
 +Type=nvvfs
diff --git a/gvfs.changes b/gvfs.changes
index 003e358..1b92616 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr  3 20:34:29 IST 2009 - msuman@suse.de
+
+- Re-based gvfs-nds.patch to make it compile with gvfs-1.2.0
+- Patched gvfs-nvvfs.patch and gvfs-nds.patch with fixes from 
+  SLE11
+
 -------------------------------------------------------------------
 Mon Mar 16 14:33:57 CET 2009 - mboman@suse.de
 
diff --git a/gvfs.spec b/gvfs.spec
index b33b0d9..3a854ee 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -38,7 +38,7 @@ BuildRequires:  pkg-config
 BuildRequires:  translation-update-upstream
 Summary:        VFS functionality for GLib
 Version:        1.2.0
-Release:        1
+Release:        2
 License:        LGPL v2.0 or later
 Group:          Development/Libraries/C and C++
 Source0:        %{name}-%{version}.tar.bz2
@@ -50,7 +50,7 @@ Patch1:         gvfs-dice-backend.patch
 Patch4:         gvfs-429959-handle-blank-schemas.patch
 # PATCH-FEATURE-OPENSUSE gvfs-nvvfs.patch ksamrat@novell.com -- Provides gvfs backend for novell nautilus plugin  
 Patch5:         gvfs-nvvfs.patch
-# PATCH-NEEDS-REBASE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus (was PATCH-FEATURE-OPENSUSE)
+# PATCH-FEATURE-OPENSUSE gvfs-nds.patch ksamrat@novell.com -- Provides NDS browsing for nautilus
 Patch6:         gvfs-nds.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -140,7 +140,7 @@ translation-update-upstream
 %patch1 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
+%patch6 -p1
 
 %build
 autoreconf -f
@@ -203,7 +203,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/gvfsd-smb-browse
 %{_libdir}/%{name}/gvfsd-trash
 %{_libdir}/%{name}/gvfsd-nvvfs
-#%{_libdir}/%{name}/gvfsd-nds
+%{_libdir}/%{name}/gvfsd-nds
 
 %files -n libgvfscommon0
 %defattr(-, root, root)
@@ -217,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}.lang
 
 %changelog
+* Thu Apr 02 2009 msuman@suse.de
+- Re-based gvfs-nds.patch to make it compile with gvfs-1.2.0
+- Patched gvfs-nvvfs.patch and gvfs-nds.patch with fixes from
+  SLE11
 * Mon Mar 16 2009 mboman@suse.de
 - Update to version 1.2.0:
   + sftp: Don't hang if ssh no authentication method availible