diff --git a/build/lib/dist/smack.jar b/build/lib/dist/smack.jar
index dfeb6d421..414224f9f 100644
Binary files a/build/lib/dist/smack.jar and b/build/lib/dist/smack.jar differ
diff --git a/build/lib/dist/smackx-debug.jar b/build/lib/dist/smackx-debug.jar
index 22f22705e..8ea9a9987 100644
Binary files a/build/lib/dist/smackx-debug.jar and b/build/lib/dist/smackx-debug.jar differ
diff --git a/build/lib/dist/smackx.jar b/build/lib/dist/smackx.jar
index df2ad678d..77d8c407b 100644
Binary files a/build/lib/dist/smackx.jar and b/build/lib/dist/smackx.jar differ
diff --git a/build/projects/Spark.iml b/build/projects/Spark.iml
index 5dd01f596..ba19b3712 100644
--- a/build/projects/Spark.iml
+++ b/build/projects/Spark.iml
@@ -81,6 +81,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/merge/backport-util-concurrent.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -108,6 +117,15 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../lib/merge/jtoaster-1.0.4.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
@@ -198,15 +216,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/merge/jtoaster.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntryProperties />
   </component>
   <component name="VcsManagerConfiguration">
diff --git a/src/commercial/fastpath.jar b/src/commercial/fastpath.jar
index 7e1e8e744..d7b89e752 100644
Binary files a/src/commercial/fastpath.jar and b/src/commercial/fastpath.jar differ
diff --git a/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java b/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java
index 27ad051a1..80e91b180 100644
--- a/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java
+++ b/src/java/org/jivesoftware/spark/ui/conferences/ConferenceRoomInfo.java
@@ -77,6 +77,8 @@ public final class ConferenceRoomInfo extends JPanel implements ChatRoomListener
     private PacketListener listener = null;
 
 
+    private boolean allowNicknameChange = true;
+
     /**
      * Creates a new RoomInfo instance using the specified ChatRoom.  The RoomInfo
      * component is responsible for monitoring all activity in the ChatRoom.
@@ -522,7 +524,10 @@ public final class ConferenceRoomInfo extends JPanel implements ChatRoomListener
 
             changeNicknameAction.putValue(Action.NAME, "Change Nickname");
             changeNicknameAction.putValue(Action.SMALL_ICON, SparkRes.getImageIcon(SparkRes.DESKTOP_IMAGE));
-            popup.add(changeNicknameAction);
+
+            if (allowNicknameChange) {
+                popup.add(changeNicknameAction);
+            }
         }
 
         Action chatAction = new AbstractAction() {
@@ -683,6 +688,10 @@ public final class ConferenceRoomInfo extends JPanel implements ChatRoomListener
 
         popup.show(list, evt.getX(), evt.getY());
     }
+
+    public void setNicknameChangeAllowed(boolean allowed) {
+        allowNicknameChange = allowed;
+    }
 }