diff --git a/source/org/jivesoftware/smack/Roster.java b/source/org/jivesoftware/smack/Roster.java
index 25c6256e0..aeee8a3f2 100644
--- a/source/org/jivesoftware/smack/Roster.java
+++ b/source/org/jivesoftware/smack/Roster.java
@@ -593,7 +593,7 @@ public class Roster {
                     for (Iterator i = entries.iterator(); i.hasNext();) {
                         RosterEntry entry = (RosterEntry) i.next();
                         if (entry.getUser().toLowerCase().equals(key.toLowerCase())) {
-                            fireRosterPresenceEvent(key);
+                            fireRosterPresenceEvent(from);
                         }
                     }
                 }
@@ -614,7 +614,7 @@ public class Roster {
                     for (Iterator i=entries.iterator(); i.hasNext(); ) {
                         RosterEntry entry = (RosterEntry)i.next();
                         if (entry.getUser().toLowerCase().equals(key.toLowerCase())) {
-                            fireRosterPresenceEvent(key);
+                            fireRosterPresenceEvent(from);
                         }
                     }
                 }
diff --git a/source/org/jivesoftware/smack/RosterListener.java b/source/org/jivesoftware/smack/RosterListener.java
index 0b8b704d8..4d3f17e75 100644
--- a/source/org/jivesoftware/smack/RosterListener.java
+++ b/source/org/jivesoftware/smack/RosterListener.java
@@ -36,7 +36,8 @@ public interface RosterListener {
     /**
      * Called when the presence of a roster entry is changed.
      *
-     * @param XMPPAddress the XMPP address of the user who's presence has changed.
+     * @param XMPPAddress the XMPP address of the user who's presence has changed,
+     *      including the resource.
      */
     public void presenceChanged(String XMPPAddress);
 }