diff --git a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
index a42e5e1bf..cd1d705e3 100644
--- a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
+++ b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
@@ -133,6 +133,7 @@ public class ServiceDiscoveryManager {
      */
     public void setIdentityName(String name) {
         identity.setName(name);
+        renewEntityCapsVersion();
     }
 
     /**
@@ -157,6 +158,7 @@ public class ServiceDiscoveryManager {
      */
     public void setIdentityType(String type) {
         identity.setType(type);
+        renewEntityCapsVersion();
     }
     
     /**
@@ -166,6 +168,7 @@ public class ServiceDiscoveryManager {
      */
     public void addIdentity(DiscoverInfo.Identity identity) {
         identities.add(identity);
+        renewEntityCapsVersion();
     }
     
     /**
@@ -178,6 +181,7 @@ public class ServiceDiscoveryManager {
     public boolean removeIdentity(DiscoverInfo.Identity identity) {
         if (identity.equals(this.identity)) return false;
         identities.remove(identity);
+        renewEntityCapsVersion();
         return true;
     }
 
@@ -318,7 +322,7 @@ public class ServiceDiscoveryManager {
      */
     public void addDiscoverInfoTo(DiscoverInfo response) {
         // First add the identities of the connection
-        response.addIdentities(identities);
+        response.addIdentities(getIdentities());
 
         // Add the registered features to the response
         synchronized (features) {