diff --git a/ChangeLog b/ChangeLog
index ff791dc1a..36c44ca4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-04  Enrico Sersale  <enrico@imago.ro>
+
+	* Source/NSWorkspace.m ([NSWorkspace -mountedRemovableMedia]): 
+  Doesn't consider a final empty line in mtab.
+
 2004-05-12 16:50  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/NSParagraphStyle.m (+defaultWritingDirectionForLanguage:):
diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index 57fd130db..886f7178e 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -1288,19 +1288,26 @@ inFileViewerRootedAtPath: (NSString*)rootFullpath
 
   for (i = 0; i < [mounts count]; i++)
     {
-      NSArray	*parts;
-      NSString	*type;
-
-      parts = [[names objectAtIndex: i] componentsSeparatedByString: @" "];
-      type = [parts objectAtIndex: 2];
-      if ([type isEqualToString: @"proc"] == NO
-	&& [type isEqualToString: @"devpts"] == NO
-	&& [type isEqualToString: @"shm"] == NO)
+      NSString  *mount = [mounts objectAtIndex: i];
+    
+      if ([mount length]) 
         {
-	  [names addObject: [parts objectAtIndex: 1]];
-	}
+          NSArray  *parts = [mount componentsSeparatedByString: @" "];
+          
+          if ([parts count] >= 2) 
+            {          
+              NSString	*type = [parts objectAtIndex: 2];
+              
+              if ([type isEqualToString: @"proc"] == NO
+	          && [type isEqualToString: @"devpts"] == NO
+	          && [type isEqualToString: @"shm"] == NO)
+              {
+	         [names addObject: [parts objectAtIndex: 1]];
+	      }
+           }
+        }
     }
-
+  
   return names;
 }