diff --git a/source/org/jivesoftware/smack/GroupChat.java b/source/org/jivesoftware/smack/GroupChat.java
index b4625481f..2fa272842 100644
--- a/source/org/jivesoftware/smack/GroupChat.java
+++ b/source/org/jivesoftware/smack/GroupChat.java
@@ -312,7 +312,11 @@ public class GroupChat {
 
     /**
      * Adds a packet listener that will be notified of any new messages in the
-     * group chat.
+     * group chat. Only "group chat" messages addressed to this group chat will
+     * be delivered to the listener. If you wish to listen for other packets
+     * that may be associated with this group chat, you should register a
+     * PacketListener directly with the XMPPConnection with the appropriate
+     * PacketListener.
      *
      * @param listener a packet listener.
      */
diff --git a/source/org/jivesoftware/smack/provider/ProviderManager.java b/source/org/jivesoftware/smack/provider/ProviderManager.java
index 0d31bca78..b9000377a 100644
--- a/source/org/jivesoftware/smack/provider/ProviderManager.java
+++ b/source/org/jivesoftware/smack/provider/ProviderManager.java
@@ -247,6 +247,8 @@ public class ProviderManager {
      *     </query>
      * &lt;/iq&gt;</pre>
      *
+     * <p>Note: this method is generally only called by the internal Smack classes.
+     *
      * @param elementName the XML element name.
      * @param namespace the XML namespace.
      * @return
@@ -269,6 +271,8 @@ public class ProviderManager {
      *     &lt;/x&gt;
      * &lt;/message&gt;</pre>
      *
+     * <p>Note: this method is generally only called by the internal Smack classes.
+     *
      * @param elementName
      * @param namespace
      * @return