diff --git a/ChangeLog b/ChangeLog
index 95598c786..f31707cff 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	Pablo Polvorin	<pablo.polvorin@process-one.net>
 
 	* src/mod_muc/mod_muc_room.erl, src/mod_muc/mod_muc.erl
diff --git a/src/mod_pubsub/node_default.erl b/src/mod_pubsub/node_default.erl
index 9fe26920c..ebb92e112 100644
--- a/src/mod_pubsub/node_default.erl
+++ b/src/mod_pubsub/node_default.erl
@@ -374,7 +374,7 @@ unsubscribe_node(Host, Node, Sender, Subscriber, _SubId) ->
 	(not Authorized) and (Affiliation =/= owner) ->
 	    {error, 'forbidden'};
 	%% Was just subscriber, remove the record
-	Affiliation == none ->
+	SubState#pubsub_state.affiliation == none ->
 	    del_state(SubState#pubsub_state.stateid),
 	    {result, default};
 	true ->