diff --git a/mozilla/rdf/base/src/nsRDFService.cpp b/mozilla/rdf/base/src/nsRDFService.cpp
index 0b4a515ce46..99ebc02a972 100644
--- a/mozilla/rdf/base/src/nsRDFService.cpp
+++ b/mozilla/rdf/base/src/nsRDFService.cpp
@@ -682,9 +682,6 @@ ServiceImpl::RegisterBuiltInResourceFactories(void)
         "",                NS_NewRDFDefaultResourceFactory,
 //        "mailaccount:",    NS_NewRDFMailAccountResourceFactory,
 //        "mailbox:",        NS_NewRDFMailResourceFactory,
-#if 0
-        "file:",           NS_NewRDFFileResourceFactory,
-#endif
         nsnull,     nsnull
     };
 
@@ -725,15 +722,15 @@ ServiceImpl::RegisterBuiltInNamedDataSources(void)
 {
     extern nsresult NS_NewRDFBookmarkDataSource(nsIRDFDataSource** result);
     extern nsresult NS_NewRDFHistoryDataSource(nsIRDFDataSource** result);
-    extern nsresult NS_NewRDFLocalFileSystemDataSource(nsIRDFDataSource** result);
+    extern nsresult NS_NewRDFFileSystemDataSource(nsIRDFDataSource** result);
 //    extern nsresult NS_NewRDFMailDataSource(nsIRDFDataSource** result);
 
     static DataSourceTable gTable[] = {
         "rdf:bookmarks",      NS_NewRDFBookmarkDataSource,
+        "rdf:files",          NS_NewRDFFileSystemDataSource,
 //        "rdf:mail",           NS_NewRDFMailDataSource, 
 #if 0
         "rdf:history",        NS_NewRDFHistoryDataSource,
-        "rdf:lfs",            NS_NewRDFLocalFileSystemDataSource,
 #endif
         nsnull,               nsnull
     };
diff --git a/mozilla/rdf/datasource/public/Makefile.in b/mozilla/rdf/datasource/public/Makefile.in
index abcde359176..26e9d429f9e 100644
--- a/mozilla/rdf/datasource/public/Makefile.in
+++ b/mozilla/rdf/datasource/public/Makefile.in
@@ -26,6 +26,7 @@ MODULE = rdf
 
 EXPORTS =				\
 	nsIXULContentSink.h		\
+	nsIRDFFileSystem.h		\
         $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
diff --git a/mozilla/rdf/datasource/public/makefile.win b/mozilla/rdf/datasource/public/makefile.win
index 867fc0bf148..a6a8fa5ee61 100644
--- a/mozilla/rdf/datasource/public/makefile.win
+++ b/mozilla/rdf/datasource/public/makefile.win
@@ -22,6 +22,7 @@ DEPTH=..\..\..
 
 EXPORTS	= \
         nsIXULContentSink.h \
+	nsIRDFFileSystem.h \
 	$(NULL)
 
 include <$(DEPTH)/config/rules.mak>
diff --git a/mozilla/rdf/datasource/src/Makefile.in b/mozilla/rdf/datasource/src/Makefile.in
index 688ebf88864..f6b8ca6e184 100644
--- a/mozilla/rdf/datasource/src/Makefile.in
+++ b/mozilla/rdf/datasource/src/Makefile.in
@@ -28,6 +28,7 @@ LIBRARY_NAME = rdfdatasource_s
 
 CPPSRCS =				\
         nsBookmarkDataSource.cpp	\
+        nsFileSystemDataSource.cpp	\
 	nsXULContentSink.cpp		\
 	nsXULDataSource.cpp		\
 	$(NULL)
diff --git a/mozilla/rdf/datasource/src/makefile.win b/mozilla/rdf/datasource/src/makefile.win
index df382c03695..95665abd1f7 100644
--- a/mozilla/rdf/datasource/src/makefile.win
+++ b/mozilla/rdf/datasource/src/makefile.win
@@ -21,6 +21,7 @@ LIBRARY_NAME=rdfdatasource_s
 
 CPP_OBJS=\
         .\$(OBJDIR)\nsBookmarkDataSource.obj    \
+        .\$(OBJDIR)\nsFileSystemDataSource.obj  \
         .\$(OBJDIR)\nsXULContentSink.obj        \
         .\$(OBJDIR)\nsXULDataSource.obj         \
 	$(NULL)
diff --git a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp
index fc3cd9c8b82..519c47b7590 100644
--- a/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp
+++ b/mozilla/rdf/datasource/src/nsFileSystemDataSource.cpp
@@ -796,9 +796,9 @@ GetFolderList(nsIRDFResource *source, nsVoidArray **array /* out */)
 
 	nsFileURL 		parentDir(uri);
 	nsNativeFileSpec 	nativeDir(parentDir);
-	for (nsDirectoryIterator i(nativeDir); i; i++)
+	for (nsDirectoryIterator i(nativeDir); i.Exists(); i++)
 	{
-		nsNativeFileSpec	nativeSpec = (const nsNativeFileSpec &)i;
+		const nsNativeFileSpec	nativeSpec = (const nsNativeFileSpec &)i;
 		if (!isVisible(nativeSpec))	continue;
 		nsFilePath		filePath(nativeSpec);
 		char			*childURL = filePath;
diff --git a/mozilla/rdf/macbuild/rdf.mcp b/mozilla/rdf/macbuild/rdf.mcp
index d15a568752c..65a66296ffa 100644
Binary files a/mozilla/rdf/macbuild/rdf.mcp and b/mozilla/rdf/macbuild/rdf.mcp differ
diff --git a/mozilla/rdf/resources/sidebar.xul b/mozilla/rdf/resources/sidebar.xul
index 61e5a3b18f9..0d8fe1467f8 100644
--- a/mozilla/rdf/resources/sidebar.xul
+++ b/mozilla/rdf/resources/sidebar.xul
@@ -6,7 +6,7 @@
   xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/TR/WD-rdf-syntax#">
 
-<xul:tree xul:datasources="rdf:bookmarks rdf:mail">
+<xul:tree xul:datasources="rdf:files rdf:bookmarks rdf:mail">
   <xul:treecol rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
   <xul:treecol rdf:resource="http://home.netscape.com/NC-rdf#URL"/>
   <xul:treecol rdf:resource="http://home.netscape.com/WEB-rdf#LastModifiedDate"/>
@@ -49,6 +49,12 @@
       <xul:treecell></xul:treecell>
     </xul:treeitem>
 
+    <xul:treeitem xul:id="NC:FilesRoot">
+      <xul:treecell>File System</xul:treecell>
+      <xul:treecell></xul:treecell>
+      <xul:treecell></xul:treecell>
+    </xul:treeitem>
+
     <xul:treeitem xul:id="NC:MailRoot">
       <xul:treecell>Mail</xul:treecell>
       <xul:treecell></xul:treecell>