diff --git a/ChangeLog b/ChangeLog
index 305514da8..3ba623f37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-10  Christophe Romain <christophe.romain@process-one.net>
+
+	* src/mod_pubsub/node_default.erl: fix unsubscription of full jid
+	subscribed node (thanks to Andy Skelton)(EJAB-839)
+
 2009-01-09  Badlop  <badlop@process-one.net>
 
 	* doc/release_notes_2.0.3.txt: New file for new release
diff --git a/src/mod_pubsub/node_default.erl b/src/mod_pubsub/node_default.erl
index fa0e24d54..c1434087d 100644
--- a/src/mod_pubsub/node_default.erl
+++ b/src/mod_pubsub/node_default.erl
@@ -367,11 +367,10 @@ unsubscribe_node(Host, Node, Sender, Subscriber, _SubId) ->
 	(not Authorized) and (Affiliation =/= owner) ->
 	    {error, ?ERR_FORBIDDEN};
 	%% Was just subscriber, remove the record
-	Affiliation == none ->
+	SubState#pubsub_state.affiliation == none ->
 	    del_state(SubState#pubsub_state.stateid),
 	    {result, default};
 	true ->
-	    %% TODO, may require better clean
 	    set_state(SubState#pubsub_state{subscription = none}),
 	    {result, default}
     end.