diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index c565b9e..10a147b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -54,7 +54,14 @@
       </match>
 
       <!-- These Thinkpads don't need a quirk: 6459 (T61p), 7664 (T60) see s2ram -->
-      <match key="system.hardware.product" prefix_outof="6459;7664;8918">
+      <match key="system.hardware.version" prefix="ThinkPad ">
+	<match key="system.hardware.version" suffix="T60">
+	  <match key="system.hardware.product" prefix_outof="7664">
+            <merge key="power_management.quirk.none" type="bool">true</merge>
+	  </match>
+	</match>
+      </match>
+      <match key="system.hardware.product" prefix_outof="6459;8918">
         <merge key="power_management.quirk.none" type="bool">true</merge>
       </match>
 
