diff --git a/10-usb-pda-palm.fdi b/10-usb-pda-palm.fdi
new file mode 100644
index 0000000..20d780c
--- /dev/null
+++ b/10-usb-pda-palm.fdi
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+
+    <!-- PalmOS PDAs via libusb -->
+    <match key="info.bus" string="usb_device">
+
+      <!-- Sony -->
+      <match key="usb_device.vendor_id" int="0x054c">
+        <!-- Sony NR and other Palm OS 4.1 devices -->
+        <match key="usb_device.product_id" int="0x000a">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony S S320 and other Palm OS 3.5 devices -->
+        <match key="usb_device.product_id" int="0x0038">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony T, SJ series, and other Palm OS 4.0 devices -->
+        <match key="usb_device.product_id" int="0x0066">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony S360 -->
+        <match key="usb_device.product_id" int="0x0095">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony NR70V/U -->
+        <match key="usb_device.product_id" int="0x009a">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony NX -->
+        <match key="usb_device.product_id" int="0x00da">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony NZ -->
+        <match key="usb_device.product_id" int="0x00e9">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony UX -->
+        <match key="usb_device.product_id" int="0x0144">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Sony TJ -->
+        <match key="usb_device.product_id" int="0x0169">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Handspring -->
+      <match key="usb_device.vendor_id" int="0x082d">
+        <!-- Visor, Treo 300 -->
+        <match key="usb_device.product_id" int="0x0100">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Treo -->
+        <match key="usb_device.product_id" int="0x0200">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Treo 600 -->
+        <match key="usb_device.product_id" int="0x0300">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Palm, Inc. and palmOne -->
+      <match key="usb_device.vendor_id" int="0x0830">
+        <!-- m500 -->
+        <match key="usb_device.product_id" int="0x0001">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- m505 -->
+        <match key="usb_device.product_id" int="0x0002">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- m515 -->
+        <match key="usb_device.product_id" int="0x0003">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0010">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0011">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- i705 -->
+        <match key="usb_device.product_id" int="0x0020">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Tungsten Z -->
+        <match key="usb_device.product_id" int="0x0030">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Tungsten W -->
+        <match key="usb_device.product_id" int="0x0031">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- m125 -->
+        <match key="usb_device.product_id" int="0x0040">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- m130 -->
+        <match key="usb_device.product_id" int="0x0050">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0051">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0052">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0053">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Tungsten series, Zire 71 -->
+        <match key="usb_device.product_id" int="0x0060">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive -->
+        <match key="usb_device.product_id" int="0x0061">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0062">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0063">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- Zire -->
+        <match key="usb_device.product_id" int="0x0070">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0071">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- m100 -->
+        <match key="usb_device.product_id" int="0x0080">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0099">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <match key="usb_device.product_id" int="0x0100">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Samsung -->
+      <match key="usb_device.vendor_id" int="0x04e8">
+        <!-- i330 -->
+        <match key="usb_device.product_id" int="0x8001">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Garmin -->
+      <match key="usb_device.vendor_id" int="0x091e">
+        <!-- IQUE 3600 -->
+        <match key="usb_device.product_id" int="0x0004">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Kyocera -->
+      <match key="usb_device.vendor_id" int="0x0c88">
+        <!-- 7135 Smartphone -->
+        <match key="usb_device.product_id" int="0x0021">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+        <!-- 6035 Smartphone -->
+        <match key="usb_device.product_id" int="0xa226">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Tapwave -->
+      <match key="usb_device.vendor_id" int="0x12ef">
+        <!-- Zodiac, Zodiac2 -->
+        <match key="usb_device.product_id" int="0x0100">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+      <!-- Aceeca -->
+      <match key="usb_device.vendor_id" int="0x4766">
+        <!-- MEZ1000 -->
+        <match key="usb_device.product_id" int="0x0001">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+   
+      <!-- Alphasmart -->
+      <match key="usb_device.vendor_id" int="0x081e">
+        <!-- Alphasmart Dana -->
+        <match key="usb_device.product_id" int="0xdf00">
+          <append key="info.capabilities" type="strlist">pda</append>
+          <merge key="pda.platform" type="string">palm</merge>
+          <merge key="pda.palm.hotsync_interface" type="copy_property">linux.device_file</merge>
+        </match>
+      </match>
+
+    </match>
+
+  </device>
+  
+</deviceinfo>
diff --git a/19-palm-acl-management.fdi b/19-palm-acl-management.fdi
new file mode 100644
index 0000000..6f5fdae
--- /dev/null
+++ b/19-palm-acl-management.fdi
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+
+    <match key="info.capabilities" contains="pda">
+      <match key="pda.platform" string="palm">
+        <append key="info.capabilities" type="strlist">access_control</append>
+        <merge key="access_control.type" type="string">pda</merge>
+        <merge key="access_control.file" type="copy_property">pda.palm.hotsync_interface</merge>
+      </match>
+    </match>
+
+  </device>
+</deviceinfo>
+
diff --git a/19-pam-acl-management.fdi b/19-pam-acl-management.fdi
deleted file mode 100644
index fe0fd10..0000000
--- a/19-pam-acl-management.fdi
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
-  <device>
-
-   <!-- Sony -->
-   <match key="usb_device.vendor_id" int="0x054c">
-      <!-- Sony NR and other Palm OS 4.1 devices -->
-      <match key="usb_device.product_id" int="0x000a">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- Sony S S320 and other Palm OS 3.5 devices -->
-      <match key="usb_device.product_id" int="0x0038">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
-      </match>
-      <!-- Sony T, SJ series, and other Palm OS 4.0 devices --> 
-      <match key="usb_device.product_id" int="0x0066">
-          <append key="info.capabilities" type="strlist">access_control</append>
-          <merge key="access_control.type" type="string">pda</merge>
-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- Sony S360 -->
-      <match key="usb_device.product_id" int="0x0095">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
-      </match>
-      <!-- Sony NR70V/U -->
-      <match key="usb_device.product_id" int="0x009a">
-          <append key="info.capabilities" type="strlist">access_control</append>
-          <merge key="access_control.type" type="string">pda</merge>
-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- Sony NX -->
-      <match key="usb_device.product_id" int="0x00da">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
-      </match>
-      <!-- Sony NZ -->
-      <match key="usb_device.product_id" int="0x00e9">
-          <append key="info.capabilities" type="strlist">access_control</append>
-          <merge key="access_control.type" type="string">pda</merge>
-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- Sony UX -->
-      <match key="usb_device.product_id" int="0x0144">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                            
-      </match>
-      <!-- Sony TJ -->
-      <match key="usb_device.product_id" int="0x0169">
-          <append key="info.capabilities" type="strlist">access_control</append>
-          <merge key="access_control.type" type="string">pda</merge>
-          <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-
-   </match>
-
-
-   <!-- Handspring -->
-   <match key="usb_device.vendor_id" int="0x082d">
-      <!-- Visor, Treo 300 -->
-      <match key="usb_device.product_id" int="0x0100">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
-      </match>
-      <!-- Treo -->
-      <match key="usb_device.product_id" int="0x0200">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
-      </match>
-      <!-- Treo 600 -->
-      <match key="usb_device.product_id" int="0x0300">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                  
-      </match>
-
-   </match>
-
-
-   <!-- Palm, Inc. and palmOne -->
-   <match key="usb_device.vendor_id" int="0x0830">
-      <!-- m500 -->
-      <match key="usb_device.product_id" int="0x0001">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- m505 -->
-      <match key="usb_device.product_id" int="0x0002">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-      <!-- m515 -->
-      <match key="usb_device.product_id" int="0x0003">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- i705 -->
-      <match key="usb_device.product_id" int="0x0020">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-      <!-- Tungsten|Z -->
-      <match key="usb_device.product_id" int="0x0030">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- Tungsten|W -->                                  
-      <match key="usb_device.product_id" int="0x0031">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- m125 -->
-      <match key="usb_device.product_id" int="0x0040">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-      <!-- m130 -->
-      <match key="usb_device.product_id" int="0x0050">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- Tungsten series, Zire 71 -->
-      <match key="usb_device.product_id" int="0x0060">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-      <!-- Zire 31, 72, Z22 -->
-      <match key="usb_device.product_id" int="0x0061">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-      <!-- Zire -->
-      <match key="usb_device.product_id" int="0x0070">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- m100 -->
-      <match key="usb_device.product_id" int="0x0080">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-
-   </match>
-
-
-   <!-- Samsung -->
-   <match key="usb_device.vendor_id" int="0x04e8">
-
-      <match key="usb_device.product_id" int="0x6601">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- i330 -->
-      <match key="usb_device.product_id" int="0x8001">
-         <append key="info.capabilities" type="strlist">access_control</append>
-         <merge key="access_control.type" type="string">pda</merge>
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge>                              
-      </match>
-
-   </match>
-
-
-   <!-- Garmin -->
-   <match key="usb_device.vendor_id" int="0x091e">
-      <!-- IQUE 3600 -->
-      <match key="usb_device.product_id" int="0x0004">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-
-   </match>
-
-
-   <!-- Kyocera -->
-   <match key="usb_device.vendor_id" int="0x0c88">
-      <!-- 7135 Smartphone -->
-      <match key="usb_device.product_id" int="0x0021">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-      <!-- 6035 Smartphone -->
-      <match key="usb_device.product_id" int="0xa226"> 
-         <append key="info.capabilities" type="strlist">access_control</append> 
-         <merge key="access_control.type" type="string">pda</merge> 
-         <merge key="access_control.file" type="copy_property">linux.device_file</merge> 
-      </match>
-                                    
-   </match>
-
-
-   <!-- Tapwave -->
-   <match key="usb_device.vendor_id" int="0x12ef">
-      <!-- Zodiac, Zodiac2 -->
-      <match key="usb_device.product_id" int="0x0100">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-
-   </match>
-
-   <!-- ACEECA -->
-   <match key="usb_device.vendor_id" int="0x4766">
-      <!-- MEZ1000 -->
-      <match key="usb_device.product_id" int="0x0001">
-        <append key="info.capabilities" type="strlist">access_control</append>
-        <merge key="access_control.type" type="string">pda</merge>
-        <merge key="access_control.file" type="copy_property">linux.device_file</merge>
-      </match>
-
-   </match>
-   
-
-  </device>
-</deviceinfo>
diff --git a/pilot-link.spec b/pilot-link.spec
index 225ac51..304fc56 100644
--- a/pilot-link.spec
+++ b/pilot-link.spec
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.2
-Release: 19%{?dist}
+Release: 20%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -11,12 +11,14 @@ Summary: File transfer utilities between Linux and PalmPilots
 URL: http://www.pilot-link.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: pilot-link-%{version}.tar.bz2
-Source1: 19-pam-acl-management.fdi
-Source2: pilot-device-file.policy
-Source3: blacklist-visor
-Source4: README.fedora
-Source5: 60-pilot.perms
-Source6: 60-pilot.rules
+# Source1 through Source3 can be dropped if/when hal is updated to 0.5.11
+Source1: 10-usb-pda-palm.fdi
+Source2: 19-palm-acl-management.fdi
+Source3: pilot-device-file.policy
+Source4: blacklist-visor
+Source5: README.fedora
+Source6: 60-pilot.perms
+Source7: 60-pilot.rules
 
 ExcludeArch: s390 s390x
 #Patch1: pilot-link-0.11.0-perlmd5.patch  # May be still applied
@@ -141,24 +143,26 @@ rm -f %{buildroot}%{_libdir}/*.la
 # remove broken prog
 rm -f %{buildroot}%{_bindir}/pilot-prc
 
-# Install hal rules file.
+# Install hal rules files
+mkdir -p %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/
+install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/10-usb-pda-palm.fdi
 mkdir -p %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/
-install -p -m644 %{SOURCE1} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-pam-acl-management.fdi
+install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi
 
 # Install PolicyKit
 mkdir -p %{buildroot}%{_datadir}/PolicyKit/policy
-install -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy
+install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/PolicyKit/policy/pilot-device-file.policy
 
 # Put visor to blacklist
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
-install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
+install -p -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
 
 # put README.fedora into tree
-cp %{SOURCE4} README.fedora
+cp %{SOURCE5} README.fedora
 
 # install visor configs to share/udev
-install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev
 install -p -m644 %{SOURCE6} %{buildroot}%{_datadir}/pilot-link/udev
+install -p -m644 %{SOURCE7} %{buildroot}%{_datadir}/pilot-link/udev
 
 %post -p /sbin/ldconfig
 
@@ -178,7 +182,8 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %{_datadir}/pilot-link
 %{_mandir}/man?/*
-%{_datadir}/hal/fdi/policy/10osvendor/19-pam-acl-management.fdi
+%{_datadir}/hal/fdi/information/20thirdparty/10-usb-pda-palm.fdi
+%{_datadir}/hal/fdi/policy/10osvendor/19-palm-acl-management.fdi
 %{_datadir}/PolicyKit/policy/pilot-device-file.policy
 %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
 
@@ -191,6 +196,13 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Fri May 23 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.2-20
+- Resolves: #280251
+  change hal rules to subsitute for pending hal-0.5.11
+  config parity with hal-0.5.11 (for Palms) but added verbosity to workaround #435093
+- Correct filename from 19-pam-acl-management.fdi to 19-palm-acl-management.fdi
+- A post-install reboot may be required to circumvent #431377
+
 * Tue Feb 12 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-19
 - change hal rules 
   usb structure name was changed to usb_device