diff --git a/ChangeLog b/ChangeLog
index 08bc3c68e..7e1cd8c79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-12  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/mod_pubsub.erl: Fix bad transaction returncode in
+	unsubscribe presence handler
+
 2009-05-11  Christophe Romain <christophe.romain@process-one.net>
 
 	* src/mod_caps.erl: Prevent race condition when calling get_caps while
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index d5259bf2e..3f9f6f22f 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -736,10 +736,10 @@ handle_cast({unsubscribe, Subscriber, Owner}, State) ->
 				true ->
 				    node_call(Type, unsubscribe_node, [NodeId, Subscriber, JID, all]);
 				false ->
-				    ok
+				    {result, ok}
 			    end;
 			_ ->
-			    ok
+			    {result, ok}
 		    end
 		end,
 		transaction(Host, Node, Action, sync_dirty);