diff --git a/Changelog b/Changelog
index 0d8069ea..f0ee3b8f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,8 @@
 0.15.5:
 	Bug fixes:
 		- Reduce time waiting for keyboard grab (#153)
+	Improvements:
+		- (Start) adding keybinding support (#131)
 
 0.15.4:
 	New feature:
diff --git a/include/keyb.h b/include/keyb.h
index 1edd0bd6..bcda64f1 100644
--- a/include/keyb.h
+++ b/include/keyb.h
@@ -8,12 +8,12 @@ typedef enum _KeyBindingAction
     CLEAR_LINE,
     MOVE_FRONT,
     MOVE_END,
+    MOVE_WORD_BACK,
+    MOVE_WORD_FORWARD,
     REMOVE_WORD_BACK,
     REMOVE_WORD_FORWARD,
     REMOVE_CHAR_FORWARD,
     REMOVE_CHAR_BACK,
-    MOVE_WORD_BACK,
-    MOVE_WORD_FORWARD,
     NUM_ABE
 } KeyBindingAction;
 
diff --git a/source/keyb.c b/source/keyb.c
index cc5bf6e8..c9db5c0f 100644
--- a/source/keyb.c
+++ b/source/keyb.c
@@ -69,7 +69,7 @@ void setup_abe ( void )
         abe[iter].kb           = NULL;
 
         config_parser_add_option ( xrm_String,
-                                   abe[iter].name, &( abe[iter].keystr ) );
+                                   abe[iter].name, (void **)&( abe[iter].keystr ) );
     }
 }