diff --git a/src/client.c b/src/client.c
index 0641925..4d20f41 100644
--- a/src/client.c
+++ b/src/client.c
@@ -1637,17 +1637,17 @@ uicb_client_set_master(uicb_t cmd)
 {
      Client *c;
      (void)cmd;
-     
+
      /* get the first client */
      screen_get_sel();
      if(!sel || ishide(sel, selscreen))
           return;
-     
+
      for(c = clients; c && ishide(c, selscreen); c = c->next);
-     
+
      if (c && c != sel)
      {
-          client_swap(c, sel); 
+          client_swap(c, sel);
           client_focus(c);
      }
      return;
diff --git a/wmfsrc b/wmfsrc
index da816bc..8de1209 100644
--- a/wmfsrc
+++ b/wmfsrc
@@ -334,6 +334,9 @@
 
         # Swap current client with the previous.
         [key] mod = {"Alt", "Shift"} key = "t" func = "client_swap_prev" [/key]
+        
+        # Set the selected client as Master
+        [key] mod = {"Control"} key = "m" func = "client_set_master" [/key]
 
         # Toggle maximum the selected client
         [key] mod = {"Alt"} key = "m" func = "toggle_max" [/key]