diff -dur pcmciautils-014/udev/rules-base pcmciautils-014-p/udev/rules-base
--- pcmciautils-014/udev/rules-base	2006-06-01 11:07:52.000000000 +0200
+++ pcmciautils-014-p/udev/rules-base	2007-01-12 04:08:53.000000000 +0100
@@ -1,14 +1,14 @@
-
+
 # Very few CIS firmware entries (which we use for matching)
 # are so broken that we need to read out random bytes of it
 # instead of the manufactor, card or product ID. Then the
 # matching is done in userspace.
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
 		RUN+="/sbin/pcmcia-check-broken-cis"
 
 # However, the "weak" matching by func_id is only allowed _after_ modprobe
 # returns, so that "strong" matches have a higher priority.
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
 		RUN+="/bin/sh -c 'echo 1 > /sys/$devpath/allow_func_id_match'"
 
 # PCMCIA sockets:
diff -dur pcmciautils-014/udev/rules-modprobe pcmciautils-014-p/udev/rules-modprobe
--- pcmciautils-014/udev/rules-modprobe	2006-06-01 11:07:52.000000000 +0200
+++ pcmciautils-014-p/udev/rules-modprobe	2007-01-12 04:08:19.000000000 +0100
@@ -1,3 +1,3 @@
-# modprobe $modalias loads all possibly appropriate modules
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="?*", \
+# modprobe $modalias loads all possibly appropriate modules
+ACTION=="add", SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \
 		RUN+="/sbin/modprobe $modalias"