diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ac97d672c..2857d886d 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.10.8
  - rfe #12016 for the top story as well
+ - fixed #11965: Friend Manager only shows 15 people
 
 7.10.7
  - rfe #10521: Use monospaced font in template edit textarea
diff --git a/docs/templates.txt b/docs/templates.txt
index d3d817d3d..369e38317 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -1,6 +1,11 @@
 This is a running list of template changes made during upgrades.  If you have copied the default
 templates, you will need to apply these changes manually to your copies.
 
+7.10.8
+
+  * Friend Manager view template - root/import/account/friendmanager/view
+    Add a div to hold the pagination.
+
 7.10.4
 
   * DataForm email template - default_email
diff --git a/docs/upgrades/packages-7.10.8/root_import_account_friendmanager_view.wgpkg b/docs/upgrades/packages-7.10.8/root_import_account_friendmanager_view.wgpkg
new file mode 100644
index 000000000..1f838ecad
Binary files /dev/null and b/docs/upgrades/packages-7.10.8/root_import_account_friendmanager_view.wgpkg differ
diff --git a/www/extras/yui-webgui/build/friendManager/friendManager.js b/www/extras/yui-webgui/build/friendManager/friendManager.js
index dad4ad717..0887885f4 100644
--- a/www/extras/yui-webgui/build/friendManager/friendManager.js
+++ b/www/extras/yui-webgui/build/friendManager/friendManager.js
@@ -97,7 +97,7 @@ WebGUI.FriendManager.MakeTable = function (groupId, containerId) {
 
     // Initialize the data table
     var myPaginator = new YAHOO.widget.Paginator({
-        containers            : ['pagination'],
+        containers            : [containerId+'_pagination'],
         pageLinks             : 7,
         rowsPerPage           : 15,
         template              : "<strong>{CurrentPageReport}</strong> {PreviousPageLink} {PageLinks} {NextPageLink}"