Index: apps/plugins/lamp.c
===================================================================
--- apps/plugins/lamp.c	(revision 17414)
+++ apps/plugins/lamp.c	(working copy)
@@ -115,6 +115,9 @@
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     short old_brightness = rb->global_settings->brightness;
 #endif /* HAVE_BACKLIGHT_BRIGHTNESS */
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    short old_buttonlight_brightness = rb->global_settings->buttonlight_brightness;
+#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
 
 #if LCD_DEPTH > 1
     unsigned bg_color=rb->lcd_get_background();
@@ -125,6 +128,9 @@
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     rb->backlight_set_brightness(MAX_BRIGHTNESS_SETTING);
 #endif /* HAVE_BACKLIGHT_BRIGHTNESS */
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    rb->buttonlight_set_brightness(MAX_BRIGHTNESS_SETTING);
+#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
 
 #ifdef HAVE_LCD_INVERT
 #ifdef OLYMPUS_MROBE_100
@@ -136,6 +142,9 @@
 #endif /* HAVE_LCD_INVERT */
 
     backlight_force_on(rb);
+#ifdef HAVE_BUTTON_LIGHT
+    buttonlight_force_on();
+#endif /* HAVE_BUTTON_LIGHT */
 
 #ifdef HAVE_LCD_COLOR
     do 
@@ -198,6 +207,9 @@
 
     /* restore */
     backlight_use_settings(rb);
+#ifdef HAVE_BUTTON_LIGHT
+    buttonlight_use_settings();
+#endif /* HAVE_BUTTON_LIGHT */
 
 #ifdef HAVE_LCD_INVERT
     rb->lcd_set_invert_display(rb->global_settings->invert);
@@ -206,6 +218,9 @@
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     rb->backlight_set_brightness(old_brightness);
 #endif /* HAVE_BACKLIGHT_BRIGHTNESS */
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    rb->buttonlight_set_brightness(old_buttonlight_brightness);
+#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
 
 #if LCD_DEPTH > 1
     rb->lcd_set_background(bg_color);
Index: apps/plugin.c
===================================================================
--- apps/plugin.c	(revision 17414)
+++ apps/plugin.c	(working copy)
@@ -590,6 +590,14 @@
 #ifdef HAVE_TOUCHPAD
     touchpad_set_mode,
 #endif /* HAVE_TOUCHPAD */
+#ifdef HAVE_BUTTON_LIGHT
+    buttonlight_set_timeout,
+    buttonlight_off,
+    buttonlight_on,
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    buttonlight_set_brightness,
+#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
+#endif /* HAVE_BUTTON_LIGHT */
 };
 
 int plugin_load(const char* plugin, void* parameter)
Index: apps/plugin.h
===================================================================
--- apps/plugin.h	(revision 17414)
+++ apps/plugin.h	(working copy)
@@ -737,6 +737,14 @@
 #ifdef HAVE_TOUCHPAD
     void (*touchpad_set_mode)(enum touchpad_mode);
 #endif /* HAVE_TOUCHPAD */
+#ifdef HAVE_BUTTON_LIGHT
+    void (*buttonlight_set_timeout)(int value);
+    void (*buttonlight_off)(void);
+    void (*buttonlight_on)(void);
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    void (*buttonlight_set_brightness)(int val);
+#endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
+#endif /* HAVE_BUTTON_LIGHT */
 };
 
 /* plugin header */