# Updated but not checked in:
#   (will commit)
#
#	new file:   fdi/policy/10osvendor/10-bluetooth-button.fdi
#	modified:   fdi/policy/10osvendor/Makefile.am
#
# Untracked files:
#   (use "git add" to add to commit)
#
#	hald/foo
#	tools/hal-system-bluetooth-button-get-power
#	tools/hal-system-bluetooth-button-set-power
diff --git a/fdi/policy/10osvendor/10-bluetooth-button.fdi b/fdi/policy/10osvendor/10-bluetooth-button.fdi
new file mode 100644
index 0000000..dfdfa30
--- /dev/null
+++ b/fdi/policy/10osvendor/10-bluetooth-button.fdi
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <match key="system.kernel.name" string="Linux"> 
+      <match key="smbios.system.manufacturer" string="Sony Corporation">
+        <match key="system.formfactor" string="laptop">
+           <spawn udi="/org/freedesktop/Hal/devices/sonypi_bluetooth_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/sonypi_bluetooth_switch">
+      <append key="info.capabilities" type="strlist">bluetooth_switch</append>
+      <merge key="info.category" type="string">bluetooth_switch</merge>
+      <merge key="info.product" type="string">Sony Bluetooth Button</merge>
+      <merge key="bluetooth_button.access_method" type="string">sonypi</merge>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.category" string="bluetooth_switch">
+      <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.BluetoothButton</append>
+
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_names" type="strlist">SetPower</append>
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_signatures" type="strlist">b</append>
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_argnames" type="strlist">power</append>
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_execpaths" type="strlist">hal-system-bluetooth-button-set-power</append>
+
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_names" type="strlist">GetPower</append>
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_signatures" type="strlist"></append>
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_argnames" type="strlist"></append>
+      <append key="org.freedesktop.Hal.Device.BluetoothButton.method_execpaths" type="strlist">hal-system-bluetooth-button-get-power</append>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/policy/10osvendor/Makefile.am b/fdi/policy/10osvendor/Makefile.am
index 734eead..8c09059 100644
--- a/fdi/policy/10osvendor/Makefile.am
+++ b/fdi/policy/10osvendor/Makefile.am
@@ -5,6 +5,7 @@ dist_fdi_DATA = 			\
 	10-keyboard-policy.fdi		\
 	10-power-mgmt-policy.fdi	\
 	10-toshiba-buttons.fdi		\
+	10-bluetooth-button.fdi		\
 	10-laptop-panel-mgmt-policy.fdi	\
 	15-storage-luks.fdi		\
 	20-storage-methods.fdi