diff --git a/19-pam-acl-management.fdi b/19-pam-acl-management.fdi
index cc517ec..fe0fd10 100644
--- a/19-pam-acl-management.fdi
+++ b/19-pam-acl-management.fdi
@@ -4,54 +4,238 @@
 
   <device>
 
-   <match key="usb.vendor_id" int="0x054c">
-      <!-- Sony Clie 3.5 -->
-      <match key="usb.product_id" int="0x0038">
+   <!-- 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 Clie SJ-22 -->
-      <match key="usb.product_id" int="0x0066">
+      <!-- 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.vendor_id" int="0x082d">
-      <!-- Visor -->
-      <match key="usb.product_id" int="0x0100">
+   <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>
 
-   <!-- Known Palm PDAs from Palm, Inc. -->
-   <match key="usb.vendor_id" int="0x0830">
-      <!-- Palm m130 -->
-      <match key="usb.product_id" int="0x0050">
+
+   <!-- 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>
-      <!-- Tungsten T5 -->
-      <match key="usb.product_id" int="0x0061">
+      <!-- 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>
 
-    <match key="info.subsystem" string="usb_device">
-      <match key="info.product" contains="Palm Handheld">
-          <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>
+
+   <!-- 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>
-    </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 ee49c50..225ac51 100644
--- a/pilot-link.spec
+++ b/pilot-link.spec
@@ -3,7 +3,7 @@
 
 Name: pilot-link
 Version: 0.12.2
-Release: 18%{?dist}
+Release: 19%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -191,6 +191,12 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* 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
+  add another pilot vid/pid identifications
+  thanks Gustavo Maciel Dias Vieira
+
 * Thu Feb  7 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-18
 - apply Tom Billet's patch for libusb & Z22 
   thanks Joe Christy and Kevin R. Page