diff --git a/docs/CREDITS b/docs/CREDITS
index 9b65e5792f..08ad3c24e3 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -511,6 +511,7 @@ Viktor Varga
 Juliusz Chroboczek
 Christian Beier
 Giovanni Zilli
+Shiloh Hawley
 
 The libmad team
 The wavpack team
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
index 55fdad1159..1d13a21b22 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-meg-fx.c
@@ -109,7 +109,6 @@ int button_read_device(void)
         /* if the buttons dont agree twice in a row, then its none */
         lastbutton = btn;
         btn = BUTTON_NONE;
-        buttonlight_on();
     }
 
     /* Check for hold first - exit if asserted with no button pressed */
@@ -121,7 +120,6 @@ int button_read_device(void)
     if (buttons)
     {
         btn |= buttons;
-        buttonlight_on();
     }
     
     /* the touchpad - only watch the lines we actually read */
@@ -152,7 +150,6 @@ int button_read_device(void)
         if (touchpad & ((1 << 9) | (1 << 8) | (1 << 7)))
             btn |= BUTTON_LEFT;
 
-        buttonlight_on();
     }
     
     /* the cradle buttons */