diff --git a/ChangeLog b/ChangeLog
index 89f52e0f8..5a0a60cbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-18 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSWorksace.m: ([openURL:]) fix to open some app which
+	supports the URL scheme.
+
 2009-03-18 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSView.m (-beginPageInRect:atPlacement:): Add parentheses
diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index cb73e11ae..c894640a9 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -808,9 +808,13 @@ static NSString			*_rootPath = @"/";
       NSString		*appName;
 
       /* Look up an application to handle this URL scheme.
+       * We get a dictionary containing all apps for the scheme.
+       * FIXME ... we just use the last app in the dictionary,
+       * but we really ought to have some way of saying which we want.
        */
       map = [applications objectForKey: @"GSSchemesMap"];
-      appName = [map objectForKey: [[url scheme] lowercaseString]];
+      map = [map objectForKey: [[url scheme] lowercaseString]];
+      appName = [[map allKeys] lastObject];
       if (appName != nil)
 	{
 	  NSString	*urlString = [url absoluteString];