diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a5f2e73123a6bdb473125072f27bdafc7ce28c73..4624399b7c75b70de90b6d9eb4b9ca1d7c7ef06c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2008-04-15  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Don't treat the misnamed NSAccessibilitySortButtonRole as an accessibility role.  It is really
+        a subrole of NSAccessibilityButtonRole.  As it is not used inside WebCore there is no change in
+        behaviour as a result of doing this.  This fixes <rdar://problem/5866444>.
+
+        * page/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::canSetFocusAttribute): Remove SortButtonRole as it is unused.
+        * page/AccessibilityObject.h: Ditto.
+        (WebCore::):
+        * page/mac/AccessibilityObjectWrapper.mm:
+        (RoleEntry::):
+
 2008-04-15  Anders Carlsson  <andersca@apple.com>
 
         Fix leaks seen on bot.
diff --git a/WebCore/page/AccessibilityObject.cpp b/WebCore/page/AccessibilityObject.cpp
index c472ec9efbb74689ab4d6509de37a7a7d76ebe42..a92c3f7613ededd81dca985855f8dd000585d9bf 100644
--- a/WebCore/page/AccessibilityObject.cpp
+++ b/WebCore/page/AccessibilityObject.cpp
@@ -1751,7 +1751,6 @@ bool AccessibilityObject::canSetFocusAttribute() const
     case MatteRole:
     case RulerRole:
     case RulerMarkerRole:
-    case SortButtonRole:
     case LinkRole:
     case DisclosureTriangleRole:
     case GridRole:
diff --git a/WebCore/page/AccessibilityObject.h b/WebCore/page/AccessibilityObject.h
index 3339abfba6ce2511b43d73f7457d87fc3492d53e..e033acd116bbfbea76c8df54e9788fca2b7876fd 100644
--- a/WebCore/page/AccessibilityObject.h
+++ b/WebCore/page/AccessibilityObject.h
@@ -125,10 +125,12 @@ enum AccessibilityRole {
     MatteRole,
     RulerRole,
     RulerMarkerRole,
-    SortButtonRole,
     LinkRole,
     DisclosureTriangleRole,
     GridRole,
+
+    // AppKit includes SortButtonRole but it is misnamed and really a subrole of ButtonRole so we do not include it here.
+
     // WebCore-specific roles
     WebCoreLinkRole,
     ImageMapRole,
diff --git a/WebCore/page/mac/AccessibilityObjectWrapper.mm b/WebCore/page/mac/AccessibilityObjectWrapper.mm
index 3f3581cc5f9ac0c534605bfff9a981c205800863..c7ca18dd1c5bb26e5193d20159ba376b57c1750e 100644
--- a/WebCore/page/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/page/mac/AccessibilityObjectWrapper.mm
@@ -669,7 +669,6 @@ static const AccessibilityRoleMap& createAccessibilityRoleMap()
         { MatteRole, NSAccessibilityMatteRole }, 
         { RulerRole, NSAccessibilityRulerRole },
         { RulerMarkerRole, NSAccessibilityRulerMarkerRole },
-        { SortButtonRole, NSAccessibilitySortButtonRole },
         { LinkRole, NSAccessibilityLinkRole },
 #ifndef BUILDING_ON_TIGER        
         { DisclosureTriangleRole, NSAccessibilityDisclosureTriangleRole },