diff --git a/bundles/org.openhab.binding.insteon/README.md b/bundles/org.openhab.binding.insteon/README.md
index 5cf73d2f18c03..1fae4d9067acc 100644
--- a/bundles/org.openhab.binding.insteon/README.md
+++ b/bundles/org.openhab.binding.insteon/README.md
@@ -96,6 +96,7 @@ These have been tested and should work out of the box:
 | 2342-222 | Mini Remote (8 Button) | F00.00.20 | Bernd Pfrommer |
 | 2441V | Insteon Thermostat Adaptor for Venstar | F00.00.21 | Bernd Pfrommer |
 | 2982-222 | Insteon Smoke Bridge | F00.00.22 | Bernd Pfrommer |
+| 2487S | KeypadLinc On/Off 8-Button | F00.00.23 | Tom Weichmann |
 | 2450 | IO Link | 0x00001A | Bernd Pfrommer |
 | 2486D | KeypadLinc Dimmer | 0x000037 | Patrick Giasson, Joe Barnum |
 | 2484DWH8 | KeypadLinc Countdown Timer | 0x000041 | Rob Nielsen |
diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBindingConstants.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBindingConstants.java
index ed70322848485..9040d5afa48a6 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBindingConstants.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBindingConstants.java
@@ -55,6 +55,10 @@ public class InsteonBindingConstants {
     public static final String FAST_ON_OFF_BUTTON_B = "fastOnOffButtonB";
     public static final String FAST_ON_OFF_BUTTON_C = "fastOnOffButtonC";
     public static final String FAST_ON_OFF_BUTTON_D = "fastOnOffButtonD";
+    public static final String FAST_ON_OFF_BUTTON_E = "fastOnOffButtonE";
+    public static final String FAST_ON_OFF_BUTTON_F = "fastOnOffButtonF";
+    public static final String FAST_ON_OFF_BUTTON_G = "fastOnOffButtonG";
+    public static final String FAST_ON_OFF_BUTTON_H = "fastOnOffButtonH";
     public static final String HEAT_SET_POINT = "heatSetPoint";
     public static final String HUMIDITY = "humidity";
     public static final String HUMIDITY_HIGH = "humidityHigh";
@@ -86,6 +90,10 @@ public class InsteonBindingConstants {
     public static final String MANUAL_CHANGE_BUTTON_B = "manualChangeButtonB";
     public static final String MANUAL_CHANGE_BUTTON_C = "manualChangeButtonC";
     public static final String MANUAL_CHANGE_BUTTON_D = "manualChangeButtonD";
+    public static final String MANUAL_CHANGE_BUTTON_E = "manualChangeButtonE";
+    public static final String MANUAL_CHANGE_BUTTON_F = "manualChangeButtonF";
+    public static final String MANUAL_CHANGE_BUTTON_G = "manualChangeButtonG";
+    public static final String MANUAL_CHANGE_BUTTON_H = "manualChangeButtonH";
     public static final String NOTIFICATION = "notification";
     public static final String ON_LEVEL = "onLevel";
     public static final String RAMP_DIMMER = "rampDimmer";
diff --git a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java
index 95581e3105067..4acb2cce0de91 100644
--- a/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java
+++ b/bundles/org.openhab.binding.insteon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java
@@ -64,6 +64,8 @@ public class InsteonDeviceHandler extends BaseThingHandler {
             InsteonBindingConstants.FAN_MODE, InsteonBindingConstants.FAST_ON_OFF,
             InsteonBindingConstants.FAST_ON_OFF_BUTTON_A, InsteonBindingConstants.FAST_ON_OFF_BUTTON_B,
             InsteonBindingConstants.FAST_ON_OFF_BUTTON_C, InsteonBindingConstants.FAST_ON_OFF_BUTTON_D,
+            InsteonBindingConstants.FAST_ON_OFF_BUTTON_E, InsteonBindingConstants.FAST_ON_OFF_BUTTON_F,
+            InsteonBindingConstants.FAST_ON_OFF_BUTTON_G, InsteonBindingConstants.FAST_ON_OFF_BUTTON_H,
             InsteonBindingConstants.HEAT_SET_POINT, InsteonBindingConstants.HUMIDITY,
             InsteonBindingConstants.HUMIDITY_HIGH, InsteonBindingConstants.HUMIDITY_LOW,
             InsteonBindingConstants.IS_COOLING, InsteonBindingConstants.IS_HEATING,
@@ -79,7 +81,9 @@ public class InsteonDeviceHandler extends BaseThingHandler {
             InsteonBindingConstants.LOAD_SWITCH_MANUAL_CHANGE, InsteonBindingConstants.LOWBATTERY,
             InsteonBindingConstants.MANUAL_CHANGE, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_A,
             InsteonBindingConstants.MANUAL_CHANGE_BUTTON_B, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_C,
-            InsteonBindingConstants.MANUAL_CHANGE_BUTTON_D, InsteonBindingConstants.NOTIFICATION,
+            InsteonBindingConstants.MANUAL_CHANGE_BUTTON_D, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_E,
+            InsteonBindingConstants.MANUAL_CHANGE_BUTTON_F, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_G,
+            InsteonBindingConstants.MANUAL_CHANGE_BUTTON_H, InsteonBindingConstants.NOTIFICATION,
             InsteonBindingConstants.ON_LEVEL, InsteonBindingConstants.RAMP_DIMMER, InsteonBindingConstants.RAMP_RATE,
             InsteonBindingConstants.RESET, InsteonBindingConstants.STAGE1_DURATION, InsteonBindingConstants.SWITCH,
             InsteonBindingConstants.SYSTEM_MODE, InsteonBindingConstants.TEMPERATURE,
diff --git a/bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml
index ca223b90e9a88..70deb6ddd7b21 100644
--- a/bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml
@@ -182,6 +182,26 @@
 		<label>Fast On/Off Button D</label>
 	</channel-type>
 
+	<channel-type id="fastOnOffButtonE">
+		<item-type>Switch</item-type>
+		<label>Fast On/Off Button E</label>
+	</channel-type>
+
+	<channel-type id="fastOnOffButtonF">
+		<item-type>Switch</item-type>
+		<label>Fast On/Off Button F</label>
+	</channel-type>
+
+	<channel-type id="fastOnOffButtonG">
+		<item-type>Switch</item-type>
+		<label>Fast On/Off Button G</label>
+	</channel-type>
+
+	<channel-type id="fastOnOffButtonH">
+		<item-type>Switch</item-type>
+		<label>Fast On/Off Button H</label>
+	</channel-type>
+
 	<channel-type id="heatSetPoint">
 		<item-type>Number</item-type>
 		<label>Heat Set Point</label>
@@ -337,6 +357,26 @@
 		<label>Manual Change Button D</label>
 	</channel-type>
 
+	<channel-type id="manualChangeButtonE">
+		<item-type>Number</item-type>
+		<label>Manual Change Button E</label>
+	</channel-type>
+
+	<channel-type id="manualChangeButtonF">
+		<item-type>Number</item-type>
+		<label>Manual Change Button F</label>
+	</channel-type>
+
+	<channel-type id="manualChangeButtonG">
+		<item-type>Number</item-type>
+		<label>Manual Change Button G</label>
+	</channel-type>
+
+	<channel-type id="manualChangeButtonH">
+		<item-type>Number</item-type>
+		<label>Manual Change Button H</label>
+	</channel-type>
+
 	<channel-type id="notification">
 		<item-type>Number</item-type>
 		<label>Notification</label>
diff --git a/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml b/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml
index bf0a3210cd6b1..0fec4a72cab6a 100644
--- a/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml
+++ b/bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml
@@ -345,6 +345,18 @@ Example entry:
      	<feature name="keypadbuttonc">KeyPadButton5</feature>
      	<feature name="keypadbuttond">KeyPadButton6</feature>
      </feature_group>
+     <feature_group name="fastonoff_button_group" type="FastOnOffButtonGroup">
+        <feature name="fastonoffbuttona">FastOnOffButton3</feature>
+        <feature name="fastonoffbuttonb">FastOnOffButton4</feature>
+        <feature name="fastonoffbuttonc">FastOnOffButton5</feature>
+        <feature name="fastonoffbuttond">FastOnOffButton6</feature>
+     </feature_group>
+     <feature_group name="manualchange_button_group" type="ManualChangeButtonGroup">
+        <feature name="manualchangebuttona">ManualChangeButton3</feature>
+        <feature name="manualchangebuttonb">ManualChangeButton4</feature>
+        <feature name="manualchangebuttonc">ManualChangeButton5</feature>
+        <feature name="manualchangebuttond">ManualChangeButton6</feature>
+     </feature_group>
      <feature_group name="ext_group" type="ExtStatusGroup">
         <feature name="ledbrightness">LEDBrightness</feature>
         <feature name="ramprate">RampRate</feature>
@@ -369,6 +381,24 @@ Example entry:
      	<feature name="keypadbuttonf">KeyPadButton6</feature>
      	<feature name="keypadbuttong">KeyPadButton7</feature>
      	<feature name="keypadbuttonh">KeyPadButton8</feature>
+     </feature_group>
+        <feature_group name="fastonoff_button_group" type="FastOnOffButtonGroup">
+        <feature name="fastonoffbuttonb">FastOnOffButton2</feature>
+        <feature name="fastonoffbuttonc">FastOnOffButton3</feature>
+        <feature name="fastonoffbuttond">FastOnOffButton4</feature>
+        <feature name="fastonoffbuttone">FastOnOffButton5</feature>
+        <feature name="fastonoffbuttonf">FastOnOffButton6</feature>
+        <feature name="fastonoffbuttong">FastOnOffButton7</feature>
+        <feature name="fastonoffbuttonh">FastOnOffButton8</feature>
+     </feature_group>
+     <feature_group name="manualchange_button_group" type="ManualChangeButtonGroup">
+        <feature name="manualchangebuttonb">ManualChangeButton2</feature>
+        <feature name="manualchangebuttonc">ManualChangeButton3</feature>
+        <feature name="manualchangebuttond">ManualChangeButton4</feature>
+        <feature name="manualchangebuttone">ManualChangeButton5</feature>
+        <feature name="manualchangebuttonf">ManualChangeButton6</feature>
+        <feature name="manualchangebuttong">ManualChangeButton7</feature>
+        <feature name="manualchangebuttonh">ManualChangeButton8</feature>
      </feature_group>
      <feature_group name="ext_group" type="ExtStatusGroup">
         <feature name="ledbrightness">LEDBrightness</feature>
@@ -509,4 +539,40 @@ Example entry:
    <feature name="lastheardfrom">GenericLastTime</feature>
  </device>
 
+ <device productKey="F00.00.23">
+     <model>2487S</model>
+     <description>KeypadLinc On/Off 8-Button Scene Control </description>
+     <feature name="loadswitch">LoadSwitchButton</feature>
+     <feature name="loadswitchmanualchange">LoadSwitchManualChange</feature>
+     <feature name="loadswitchfastonoff">LoadSwitchFastOnOff</feature>
+     <feature_group name="button_group" type="KeyPadButtonGroup">
+     	<feature name="keypadbuttonb">KeyPadButton2</feature>
+     	<feature name="keypadbuttonc">KeyPadButton3</feature>
+     	<feature name="keypadbuttond">KeyPadButton4</feature>
+     	<feature name="keypadbuttone">KeyPadButton5</feature>
+     	<feature name="keypadbuttonf">KeyPadButton6</feature>
+     	<feature name="keypadbuttong">KeyPadButton7</feature>
+     	<feature name="keypadbuttonh">KeyPadButton8</feature>
+     </feature_group>
+     <feature_group name="fastonoff_button_group" type="FastOnOffButtonGroup">
+        <feature name="fastonoffbuttonb">FastOnOffButton2</feature>
+        <feature name="fastonoffbuttonc">FastOnOffButton3</feature>
+        <feature name="fastonoffbuttond">FastOnOffButton4</feature>
+        <feature name="fastonoffbuttone">FastOnOffButton5</feature>
+        <feature name="fastonoffbuttonf">FastOnOffButton6</feature>
+        <feature name="fastonoffbuttong">FastOnOffButton7</feature>
+        <feature name="fastonoffbuttonh">FastOnOffButton8</feature>
+     </feature_group>
+     <feature_group name="manualchange_button_group" type="ManualChangeButtonGroup">
+        <feature name="manualchangebuttonb">ManualChangeButton2</feature>
+        <feature name="manualchangebuttonc">ManualChangeButton3</feature>
+        <feature name="manualchangebuttond">ManualChangeButton4</feature>
+        <feature name="manualchangebuttone">ManualChangeButton5</feature>
+        <feature name="manualchangebuttonf">ManualChangeButton6</feature>
+        <feature name="manualchangebuttong">ManualChangeButton7</feature>
+        <feature name="manualchangebuttonh">ManualChangeButton8</feature>
+     </feature_group>
+     <feature name="lastheardfrom">GenericLastTime</feature>
+ </device>
+
 </xml>