diff --git a/69-pilot-link.rules b/69-pilot-link.rules
index 6e18ed1..da96e61 100644
--- a/69-pilot-link.rules
+++ b/69-pilot-link.rules
@@ -1 +1,104 @@
-BUS=="usb", SYSFS{product}=="Palm Handheld*|Handspring*",ENV{ACL_MANAGE}="1"
\ No newline at end of file
+ACTION!="add", GOTO="pilot_link_end"
+SUBSYSTEM!="usb", GOTO="pilot_link_end"
+
+# Sony
+ATTR{idVendor}!="054c", GOTO="pilot_link_sony_end"
+# Sony NR and other Palm OS 4.1
+ATTR{idProduct}=="000a", ENV{ACL_MANAGE}="1"
+# Sony S S320 and other Palm OS 3.5
+ATTR{idProduct}=="0038", ENV{ACL_MANAGE}="1"
+# Sony T, SJ series, and other Palm OS 4.0
+ATTR{idProduct}=="0066", ENV{ACL_MANAGE}="1"
+# Sony S360
+ATTR{idProduct}=="0095", ENV{ACL_MANAGE}="1"
+# Sony NR70V/U
+ATTR{idProduct}=="009a", ENV{ACL_MANAGE}="1"
+# Sony NX
+ATTR{idProduct}=="00da", ENV{ACL_MANAGE}="1"
+# Sony NZ
+ATTR{idProduct}=="00e9", ENV{ACL_MANAGE}="1"
+# Sony UX
+ATTR{idProduct}=="0144", ENV{ACL_MANAGE}="1"
+# Sony TJ
+ATTR{idProduct}=="0169", ENV{ACL_MANAGE}="1"
+LABEL="pilot_link_sony_end"
+
+# Handspring
+ATTR{idVendor}!="082d", GOTO="pilot_link_handspring_end"
+# Visor/Treo 300
+ATTR{idProduct}=="0100", ENV{ACL_MANAGE}="1"
+# Treo
+ATTR{idProduct}=="0200", ENV{ACL_MANAGE}="1"
+# Treo 600
+ATTR{idProduct}=="0300", ENV{ACL_MANAGE}="1"
+LABEL="pilot_link_handspring_end"
+
+# Palm, Inc. and palmOne
+ATTR{idVendor}!="0830", GOTO="pilot_link_palm_end"
+# m500
+ATTR{idProduct}=="0001", ENV{ACL_MANAGE}="1"
+# m505
+ATTR{idProduct}=="0002", ENV{ACL_MANAGE}="1"
+# m515
+ATTR{idProduct}=="0003", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0010", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0011", ENV{ACL_MANAGE}="1"
+# i705
+ATTR{idProduct}=="0020", ENV{ACL_MANAGE}="1"
+# Tungsten Z
+ATTR{idProduct}=="0030", ENV{ACL_MANAGE}="1"
+# Tungsten W
+ATTR{idProduct}=="0031", ENV{ACL_MANAGE}="1"
+# m125
+ATTR{idProduct}=="0040", ENV{ACL_MANAGE}="1"
+# m130
+ATTR{idProduct}=="0050", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0051", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0052", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0053", ENV{ACL_MANAGE}="1"
+# Tungsten series, Zire 71
+ATTR{idProduct}=="0060", ENV{ACL_MANAGE}="1"
+# Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive
+ATTR{idProduct}=="0061", ENV{ACL_MANAGE}="1"
+# Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive
+ATTR{idProduct}=="0062", ENV{ACL_MANAGE}="1"
+# Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive
+ATTR{idProduct}=="0063", ENV{ACL_MANAGE}="1"
+# Zire
+ATTR{idProduct}=="0070", ENV{ACL_MANAGE}="1"
+# Zire
+ATTR{idProduct}=="0071", ENV{ACL_MANAGE}="1"
+# m100
+ATTR{idProduct}=="0080", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0099", ENV{ACL_MANAGE}="1"
+# unknown
+ATTR{idProduct}=="0100", ENV{ACL_MANAGE}="1"
+LABEL="pilot_link_palm_end"
+
+# Samsung i330
+ATTR{idVendor}=="04e8", ATTR{idProduct}=="8001", ENV{ACL_MANAGE}="1"
+
+# Garmin IQUE 3600
+ATTR{idVendor}=="091e", ATTR{idProduct}=="0004", ENV{ACL_MANAGE}="1"
+
+# Kyocera 7135 Smartphone
+ATTR{idVendor}=="0c88", ATTR{idProduct}=="0021", ENV{ACL_MANAGE}="1"
+# Kyocera 6035 Smartphone
+ATTR{idVendor}=="0c88", ATTR{idProduct}=="a226", ENV{ACL_MANAGE}="1"
+
+# Tapwave Zodiac, Zodiac2
+ATTR{idVendor}=="12ef", ATTR{idProduct}=="0100", ENV{ACL_MANAGE}="1"
+
+# Aceeca MEZ1000
+ATTR{idVendor}=="4766", ATTR{idProduct}=="0001", ENV{ACL_MANAGE}="1"
+
+# Alphasmart Dana
+ATTR{idVendor}=="081e", ATTR{idProduct}=="df00", ENV{ACL_MANAGE}="1"
+
+LABEL="pilot_link_end"
diff --git a/pilot-link.spec b/pilot-link.spec
index 09b7914..be2153c 100644
--- a/pilot-link.spec
+++ b/pilot-link.spec
@@ -2,7 +2,7 @@
 
 Name: pilot-link
 Version: 0.12.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 2
 License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
 Group: Applications/Communications
@@ -185,6 +185,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Nov 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.4-4
+- Better udev rules, thanks to Kevin Kofler
+
 * Sun Nov 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.4-3
 - Install udev rules again, updated for new ACL handling by udev (#529259)