diff --git a/ChangeLog b/ChangeLog
index 08240c72a..37a7a7112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-22  Mickael Remond  <mremond@process-one.net>
+
+	* src/ejabberd_c2s.erl: user_send_packet hook now called on all packets
+	including presence packets (EJAB-634)
+
 2008-05-22  Badlop  <badlop@process-one.net>
 
 	* README: R12 support: remove compilation warning (EJAB-630)
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index afc70dc28..a8d78b2fc 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -903,6 +903,10 @@ session_established({xmlstreamelement, El}, StateData) ->
 				       Server,
 				       NewEl,
 				       [User, Server]),
+			ejabberd_hooks:run(
+			  user_send_packet,
+			  Server,
+			  [FromJID, ToJID, PresenceEl]),
 			case ToJID of
 			    #jid{user = User,
 				 server = Server,