Index: sipXconfig/web/context/WEB-INF/speeddial/ButtonEditor.html
===================================================================
--- sipXconfig/web/context/WEB-INF/speeddial/ButtonEditor.html	(revision 18494)
+++ sipXconfig/web/context/WEB-INF/speeddial/ButtonEditor.html	(working copy)
@@ -15,6 +15,11 @@
       value="ognl:button.blf" />
   </td>
   <td>
+    <span jwcid="ring@TextField"
+      value="ognl:button.ring"
+      displayName="ognl:container.messages.getMessage('label.ring')" />
+  </td>
+  <td>
     <a jwcid="linkDelete@LinkSubmit"
       selected="ognl:removeIndex"
       tag="ognl:index">
Index: sipXconfig/web/context/WEB-INF/speeddial/SpeedDialPanel.properties
===================================================================
--- sipXconfig/web/context/WEB-INF/speeddial/SpeedDialPanel.properties	(revision 18494)
+++ sipXconfig/web/context/WEB-INF/speeddial/SpeedDialPanel.properties	(working copy)
@@ -1,4 +1,5 @@
 label.label=Name
 label.number=Number
 label.blf=Subscribe to presence
+label.ring=Ring Tone
 link.addNumber=Add Number
Index: sipXconfig/web/context/WEB-INF/speeddial/SpeedDialPanel.html
===================================================================
--- sipXconfig/web/context/WEB-INF/speeddial/SpeedDialPanel.html	(revision 18494)
+++ sipXconfig/web/context/WEB-INF/speeddial/SpeedDialPanel.html	(working copy)
@@ -19,6 +19,7 @@
       <th><span key="label.label">Label</span></th>
       <th><span key="label.number">Number</span></th>
       <th><span key="label.blf">BLF</span></th>
+      <th><span key="label.ring">Ringtone</span></th>
       <th colspan="3"><!-- delete, up, down --></th>
     </tr>
   </thead>
Index: sipXconfig/plugins/polycom/src/org/sipfoundry/sipxconfig/phone/polycom/DirectoryConfiguration.java
===================================================================
--- sipXconfig/plugins/polycom/src/org/sipfoundry/sipxconfig/phone/polycom/DirectoryConfiguration.java	(revision 18494)
+++ sipXconfig/plugins/polycom/src/org/sipfoundry/sipxconfig/phone/polycom/DirectoryConfiguration.java	(working copy)
@@ -90,6 +91,7 @@
         private String m_lastName;
         private final String m_contact;
         private int m_speedDial = -1;
+        private String m_ring;
 
         public PolycomPhonebookEntry(PhonebookEntry entry) {
             m_contact = entry.getNumber();
@@ -101,6 +103,7 @@
             m_contact = button.getNumber();
             m_firstName = button.getLabel();
             m_speedDial = speedDial;
+            m_ring = button.getRing();
         }
 
         public String getFirstName() {
@@ -125,6 +128,10 @@
             return m_speedDial;
         }
 
+        public String getRing() {
+            return m_ring;
+        }
+
         @Override
         public int hashCode() {
             return new HashCodeBuilder().append(m_contact).toHashCode();
Index: sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/Button.java
===================================================================
--- sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/Button.java	(revision 18494)
+++ sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/Button.java	(working copy)
@@ -18,6 +18,7 @@
     private String m_label;
     private String m_number;
     private boolean m_blf;
+    private String m_ring;
 
     public Button() {
     }
@@ -54,6 +55,14 @@
         m_blf = blf;
     }
 
+    public String getRing() {
+        return m_ring;
+    }
+
+    public void setRing(String val) {
+        m_ring = val;
+    }
+
     @Override
     public int hashCode() {
         return new HashCodeBuilder().append(m_label).append(m_number).toHashCode();
Index: sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/speeddial.hbm.xml
===================================================================
--- sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/speeddial.hbm.xml	(revision 18494)
+++ sipXconfig/neoconf/src/org/sipfoundry/sipxconfig/speeddial/speeddial.hbm.xml	(working copy)
@@ -17,6 +17,7 @@
         <property name="label" />
         <property name="number" />
         <property name="blf" />
+        <property name="ring" />
       </composite-element>
     </list>
   </class>
@@ -35,6 +36,7 @@
         <property name="label" />
         <property name="number" />
         <property name="blf" />
+        <property name="ring" />
       </composite-element>
     </list>
   </class>
Index: sipXconfig/neoconf/etc/database/speeddial_group.sql
===================================================================
--- sipXconfig/neoconf/etc/database/speeddial_group.sql	(revision 18494)
+++ sipXconfig/neoconf/etc/database/speeddial_group.sql	(working copy)
@@ -9,6 +9,7 @@
     label varchar(255),
     number varchar(255) not null,
     blf boolean not null default false,
+    ring varchar(255),
     position int4 not null,
     primary key (speeddial_id, position)
 );
@@ -23,4 +24,4 @@
   foreign key (speeddial_id)
   references speeddial_group;
 
-create sequence speeddial_group_seq;
\ No newline at end of file
+create sequence speeddial_group_seq;
Index: sipXconfig/neoconf/etc/database/speeddial.sql
===================================================================
--- sipXconfig/neoconf/etc/database/speeddial.sql	(revision 18494)
+++ sipXconfig/neoconf/etc/database/speeddial.sql	(working copy)
@@ -9,6 +9,7 @@
     label varchar(255),
     number varchar(255) not null,
     blf boolean not null default false,
+    ring varchar(255),
     position int4 not null,
     primary key (speeddial_id, position)
 );
@@ -23,4 +24,4 @@
   foreign key (speeddial_id)
   references speeddial;
 
-create sequence speeddial_seq;
\ No newline at end of file
+create sequence speeddial_seq;
Index: sipXconfig/neoconf/etc/database/schema.sql
===================================================================
--- sipXconfig/neoconf/etc/database/schema.sql	(revision 18494)
+++ sipXconfig/neoconf/etc/database/schema.sql	(working copy)
@@ -547,6 +547,7 @@
     label varchar(255),
     number varchar(255) not null,
     blf boolean not null default false,
+    ring varchar(255),
     position int4 not null,
     primary key (speeddial_id, position)
 );