diff --git a/ewmh.c b/ewmh.c
old mode 100644
new mode 100755
index 4ce9c5e8..2d8bf86f
--- a/ewmh.c
+++ b/ewmh.c
@@ -418,7 +418,8 @@ ewmh_process_client_message(xcb_client_message_event_t *ev)
     {
         if((c = client_getbywin(ev->window))) {
             luaA_object_push(globalconf.L, c);
-            luaA_object_emit_signal(globalconf.L, -1, "request::activate", 0);
+            lua_pushstring(globalconf.L,"ewmh");
+            luaA_object_emit_signal(globalconf.L, -2, "request::activate", 1);
             lua_pop(globalconf.L, 1);
         }
     }
diff --git a/lib/awful/rules.lua.in b/lib/awful/rules.lua.in
index d4bad253..16655e62 100644
--- a/lib/awful/rules.lua.in
+++ b/lib/awful/rules.lua.in
@@ -239,7 +239,7 @@ function rules.execute(c, props, callbacks)
     -- Do this at last so we do not erase things done by the focus
     -- signal.
     if props.focus and (type(props.focus) ~= "function" or props.focus(c)) then
-        c:emit_signal('request::activate')
+        c:emit_signal('request::activate',"rules")
     end
 end