diff --git a/ChangeLog b/ChangeLog
index 907eda035..73a2dbb5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-23  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/ejabberd_c2s.erl: Do not call mod_caps:clear_caps, this previous
+	optimization is too agressive and breaks PubSub/PEP standard behavior
+	(EJAB-854)
+
 2009-02-21  Badlop  <badlop@process-one.net>
 
  	* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 8e624612d..e63e9c3f2 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1113,7 +1113,9 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
 				%% Note contact availability
 				case xml:get_attr_s("type", Attrs) of
 				    "unavailable" -> 
-					mod_caps:clear_caps(From);
+					%mod_caps:clear_caps(From);
+					% caps clear disabled cause it breaks things
+					ok;
 				    _ -> 
 					Caps = mod_caps:read_caps(Els),
 					mod_caps:note_caps(StateData#state.server, From, Caps)