diff --git a/ChangeLog b/ChangeLog
index e67d6642e..78b3e1f31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-18  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Tools/pl2link.m (main): Get the category from a new entry named
+	FreeDesktopCategories.
+	Patch by Philippe Roussel <p.o.roussel@free.fr>.
+
 2012-04-17  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/ObjectiveC2/runtime.c: Fi error calculating instance
diff --git a/Tools/pl2link.m b/Tools/pl2link.m
index c9de46c2b..ad12cb965 100644
--- a/Tools/pl2link.m
+++ b/Tools/pl2link.m
@@ -102,8 +102,18 @@ main(int argc, char** argv, char **env)
   fileContents = [NSMutableString stringWithCapacity: 200];
   [fileContents appendString:
     @"[Desktop Entry]\nEncoding=UTF-8\nType=Application\n"];
-  [fileContents appendString:
-    @"Categories=X-GNUstep;\n"];
+  list = [plist objectForKey: @"FreeDesktopCategories"];
+  if (list != nil && [list isKindOfClass: [NSArray class]] && [list count] > 0)
+    {
+      [fileContents appendString: @"Categories="];
+      [fileContents appendString: [list componentsJoinedByString: @";"]];
+      [fileContents appendString: @";\n"];
+    }
+  else
+    {
+      [fileContents appendString:
+                      @"Categories=X-GNUstep;\n"];
+    }
   entry = [plist objectForKey: @"ApplicationName"];
   if (entry != nil)
     {