diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
index f9ff82a97..2a387f13b 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
+import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
@@ -36,7 +37,7 @@ import org.jivesoftware.smack.roster.packet.RosterPacket;
  *
  * @author Matt Tucker
  */
-public class RosterEntry {
+public final class RosterEntry extends Manager {
 
     /**
      * The JID of the entity/user.
@@ -47,7 +48,6 @@ public class RosterEntry {
     private RosterPacket.ItemType type;
     private RosterPacket.ItemStatus status;
     final private Roster roster;
-    final private XMPPConnection connection;
 
     /**
      * Creates a new roster entry.
@@ -60,12 +60,12 @@ public class RosterEntry {
      */
     RosterEntry(String user, String name, RosterPacket.ItemType type,
                 RosterPacket.ItemStatus status, Roster roster, XMPPConnection connection) {
+        super(connection);
         this.user = user;
         this.name = name;
         this.type = type;
         this.status = status;
         this.roster = roster;
-        this.connection = connection;
     }
 
     /**
@@ -103,7 +103,7 @@ public class RosterEntry {
         RosterPacket packet = new RosterPacket();
         packet.setType(IQ.Type.set);
         packet.addRosterItem(toRosterItem(this));
-        connection.createPacketCollectorAndSend(packet).nextResultOrThrow();
+        connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
 
         // We have received a result response to the IQ set, the name was successfully changed
         this.name = name;