diff --git a/build/build.xml b/build/build.xml
index 4e0a9587..7f648664 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -24,7 +24,7 @@
     <property name="version.major" value="2"/>
     <property name="version.minor" value="5"/>
     <property name="version.revision" value="5"/>
-    <property name="version.extra" value="beta1"/>
+    <property name="version.extra" value=""/>
     <!-- For 'beta' or 'alpha' -->
 
     <!-- Setup the full version property correctly -->
diff --git a/src/commercial/jingle.jar b/src/commercial/jingle.jar
index 6f8999ab..a30a0b2c 100644
Binary files a/src/commercial/jingle.jar and b/src/commercial/jingle.jar differ
diff --git a/src/commercial/sparkphone.jar b/src/commercial/sparkphone.jar
index e9520b4e..90e65578 100644
Binary files a/src/commercial/sparkphone.jar and b/src/commercial/sparkphone.jar differ
diff --git a/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java b/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
index 71ab193f..4b43a5fd 100644
--- a/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
+++ b/src/java/org/jivesoftware/spark/ui/rooms/GroupChatRoom.java
@@ -1076,7 +1076,7 @@ public final class GroupChatRoom extends ChatRoom {
      * An internal UI implementation for display subjects
      * within the conference room.
      */
-    private class SubjectPanel extends JPanel {
+    public class SubjectPanel extends JPanel {
 
         private JLabel iconLabel;
         private JLabel roomJIDLabel;
@@ -1099,6 +1099,19 @@ public final class GroupChatRoom extends ChatRoom {
         public void setSubject(String subject) {
             subjectLabel.setText(subject);
         }
+
+        public void setRoomLabel(String label) {
+            roomJIDLabel.setText(label);
+        }
+    }
+
+    /**
+     * Returns the descriptive panel at the top of the room.
+     *
+     * @return the SubjectPanel.
+     */
+    public SubjectPanel getSubjectPanel() {
+        return subjectPanel;
     }
 
     public Color getColor(String nickname) {
diff --git a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
index f8350a8d..f0556834 100644
--- a/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
+++ b/src/java/org/jivesoftware/sparkimpl/settings/JiveInfo.java
@@ -17,11 +17,11 @@ public class JiveInfo {
     }
 
     public static String getVersion() {
-        return "2.5.5.beta1";
+        return "2.5.5";
     }
 
     public static String getBuildNumber() {
-        return "2.5.5.beta1";
+        return "2.5.5";
     }
 
     public static String getOS() {