diff -p -up libnjb-2.2.6/libnjb.fdi.orig~ libnjb-2.2.6/libnjb.fdi
--- libnjb-2.2.6/libnjb.fdi.orig~	2007-06-04 20:02:55.000000000 -0400
+++ libnjb-2.2.6/libnjb.fdi	2009-11-24 22:38:10.453190887 -0500
@@ -7,6 +7,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="oasis">
@@ -19,6 +21,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">oasis</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox</merge>
         </match>
@@ -28,6 +33,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox 2</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -40,6 +47,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox 2</merge>
         </match>
@@ -49,6 +59,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox 3</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -61,6 +73,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox 3</merge>
         </match>
@@ -70,6 +85,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox Zen</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -82,6 +99,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen</merge>
         </match>
@@ -91,6 +111,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox Zen USB 2.0</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -103,6 +125,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen USB 2.0</merge>
         </match>
@@ -112,6 +137,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox Zen NX</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -124,6 +151,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen NX</merge>
         </match>
@@ -133,6 +163,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox Zen Xtra</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -145,6 +177,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen Xtra</merge>
         </match>
@@ -154,6 +189,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Dell</merge>
+          <merge key="info.product" type="string">Digital Jukebox</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -166,6 +203,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Dell Digital Jukebox</merge>
         </match>
@@ -175,6 +215,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomad Jukebox Zen Touch</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -187,6 +229,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen Touch</merge>
         </match>
@@ -196,6 +241,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Zen</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -208,6 +255,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Zen</merge>
         </match>
@@ -217,6 +267,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Nomade Jukebox Zen Micro</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -229,6 +281,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Nomad Jukebox Zen Micro</merge>
         </match>
@@ -238,6 +293,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Dell, Inc.</merge>
+          <merge key="info.product" type="string">Digital Jukebox (2nd Generation)</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -250,6 +307,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Dell Digital Jukebox (2nd Generation)</merge>
         </match>
@@ -259,6 +319,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Dell, Inc.</merge>
+          <merge key="info.product" type="string">Pocket DJ</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -271,6 +333,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Dell Pocket DJ</merge>
         </match>
@@ -280,6 +345,8 @@
           <match key="info.capabilities" contains_not="portable_audio_player">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
           </match>
+          <merge key="info.vendor" type="string">Creative Technology, Ltd.</merge>
+          <merge key="info.product" type="string">Zen Sleek</merge>
           <merge key="info.category" type="string">portable_audio_player</merge>
           <merge key="portable_audio_player.access_method" type="string">user</merge>
           <match key="portable_audio_player.access_method.protocols" contains_not="pde">
@@ -292,6 +359,9 @@
           <match key="portable_audio_player.output_formats" contains_not="audio/x-ms-wma">
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <match key="portable_audio_player.output_formats" contains_not="audio/x-wav">
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          </match>
           <merge key="portable_audio_player.libnjb.protocol" type="string">pde</merge>
           <merge key="portable_audio_player.libnjb.name" type="string">Creative Zen Sleek</merge>
         </match>