diff --git a/ChangeLog b/ChangeLog
index 175dd9b63..59c134e58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	* src/ejabberdctl.template: Likewise
 	* tools/ejabberdctl: Likewise
 
+	* src/mod_pubsub/mod_pubsub.erl: Pubsub subscription is now wrapped in
+	pubsub tags (EJAB-580)
+
 2008-03-21  Badlop  <badlop@process-one.net>
 
 	* src/cyrsasl_digest.erl: Rewrite io:format calls to loglevel
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index a27656c7a..b9ba6b866 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1351,13 +1351,12 @@ subscribe_node(Host, Node, From, JID) ->
 			[{"node", node_to_string(Node)},
 			 {"jid", jlib:jid_to_string(Subscriber)},
 			 {"subscription", subscription_to_string(Subscription)}],
-		    case Subscription of
-			subscribed ->
-			    [{xmlelement, "subscription",
-			      Fields ++ [{"subid", SubId}], []}];
-			_ ->
-			    [{xmlelement, "subscription", Fields, []}]
-		    end
+		    [{xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], 
+			[{xmlelement, "subscription",
+			    case Subscription of
+			    subscribed -> [{"subid", SubId}|Fields];
+			    _ -> Fields
+			    end, []}]}]
 	    end,
     case transaction(Host, Node, Action, sync_dirty) of
 	{error, Error} ->