diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index 4c497ba..2e78b6d 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -252,16 +252,22 @@ function theme_pager($variables) {
     if ($i != $pager_max) {
       if ($i > 1) {
         $items[] = array(
-          '#wrapper_attributes' => array('class' => array('pager-ellipsis')),
-          '#markup' => '…',
-        );
+           'class' => array('pager-ellipsis'),
+           'data' => theme('pager_link__ellipsis', array(
+             'text' => '…',
+             'page_new' => pager_load_array($i - 1, $element, $pager_page_array),
+             'element' => $element,
+             'parameters' => $parameters,
+             'attributes' => array('title' => t('Jump to previous group')),
+           )),
+         );
       }
       // Now generate the actual pager piece.
       for (; $i <= $pager_last && $i <= $pager_max; $i++) {
         if ($i < $pager_current) {
           $items[] = array(
-            '#wrapper_attributes' => array('class' => array('pager-item')),
-            '#markup' => theme('pager_link', array(
+            'class' => array('pager-item'),
+            'data' => theme('pager_link__previous', array(
               'text' => $i,
               'page_new' => pager_load_array($i - 1, $element, $pager_page_array),
               'element' => $element,
@@ -278,8 +284,8 @@ function theme_pager($variables) {
         }
         if ($i > $pager_current) {
           $items[] = array(
-            '#wrapper_attributes' => array('class' => array('pager-item')),
-            '#markup' => theme('pager_link', array(
+            'class' => array('pager-item'),
+            'data' => theme('pager_link__next', array(
               'text' => $i,
               'page_new' => pager_load_array($i - 1, $element, $pager_page_array),
               'element' => $element,
@@ -291,8 +297,14 @@ function theme_pager($variables) {
       }
       if ($i < $pager_max) {
         $items[] = array(
-          '#wrapper_attributes' => array('class' => array('pager-ellipsis')),
-          '#markup' => '…',
+          'class' => array('pager-ellipsis'),
+          'data' => theme('pager_link__ellipsis', array(
+            'text' => '…',
+            'page_new' => pager_load_array($i - 1, $element, $pager_page_array),
+            'element' => $element,
+            'parameters' => $parameters,
+            'attributes' => array('title' => t('Jump to next group')),
+          )),
         );
       }
     }