3 files changed, 21 insertions, 16 deletions
diff --git a/fdi/policy/10osvendor/10-laptop-buttons.fdi b/fdi/policy/10osvendor/10-laptop-buttons.fdi
new file mode 100644
index 00000000..ee7cd0bf
--- /dev/null
+++ b/fdi/policy/10osvendor/10-laptop-buttons.fdi
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <match key="system.formfactor" string="laptop">
+      <!-- Only launch the addon for Toshiba laptops. -->
+      <match key="system.hardware.vendor" string="TOSHIBA">
+        <append key="info.addons" type="strlist">hald-addon-acpi-buttons-toshiba</append>
+        <append key="info.capabilities" type="strlist">button</append>
+      </match>
+  
+      <!-- button capability for IBM laptops -->
+      <match key="system.hardware.vendor" string="IBM">
+        <append key="info.capabilities" type="strlist">button</append>
+      </match>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/policy/10osvendor/10-toshiba-buttons.fdi b/fdi/policy/10osvendor/10-toshiba-buttons.fdi
deleted file mode 100644
index d60bee2a..00000000
--- a/fdi/policy/10osvendor/10-toshiba-buttons.fdi
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
-  <!-- Only launch the addon for Toshiba laptops. -->
-  <device>
-    <match key="system.hardware.vendor" string="TOSHIBA">
-      <match key="system.formfactor" string="laptop">
-        <append key="info.addons" type="strlist">hald-addon-acpi-buttons-toshiba</append>
-        <append key="info.capabilities" type="strlist">button</append>
-      </match>
-    </match>
-  </device>
-
-</deviceinfo>
diff --git a/fdi/policy/10osvendor/Makefile.am b/fdi/policy/10osvendor/Makefile.am
index 98bbe927..d60d5b3b 100644
--- a/fdi/policy/10osvendor/Makefile.am
+++ b/fdi/policy/10osvendor/Makefile.am
@@ -4,7 +4,7 @@ fdidir = $(datadir)/hal/fdi/policy/10osvendor
 dist_fdi_DATA = 			\
 	10-keyboard-policy.fdi		\
 	10-power-mgmt-policy.fdi	\
-	10-toshiba-buttons.fdi		\
+	10-laptop-buttons.fdi		\
 	10-rfkill-switch.fdi		\
 	10-laptop-panel-mgmt-policy.fdi	\
 	15-storage-luks.fdi		\