$NetBSD: patch-ab,v 1.1 2008/12/26 15:33:04 jmcneill Exp $

--- fdi/information/10freedesktop/10-usb-music-players.fdi.orig	2008-10-20 04:51:31.000000000 -0400
+++ fdi/information/10freedesktop/10-usb-music-players.fdi	2008-12-26 10:32:13.000000000 -0500
@@ -911,14 +911,16 @@
 
     <match key="info.category" string="storage">
       <!-- Sony PSP (PlayStation Portable) -->
-      <match key="storage.vendor" string="Sony">
-        <match key="storage.model" string="PSP">
+      <match key="storage.vendor" string_outof="Sony;SONY">
+        <match key="storage.model" contains="PSP">
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
           <!-- NOTE: for backward compatibility until key get removed finally -->
           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
           <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
           <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
           <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
+	  <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
 	  <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
           <merge key="storage.drive_type" type="string">memory_stick</merge>
         </match>
