diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 2078d9c77b..fb3abec220 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -830,7 +830,7 @@
                                     [% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
                                     [% SET return_claims = patron.return_claims %]
                                     [% IF return_claims.count > ClaimReturnedWarningThreshold %]
-                                        <li><span class="circ-hlt return-claims">Return claims: Patron has [% return_claims.count | html %] RETURN CLAIMS.</span>
+                                        <li><span class="circ-hlt return-claims">Return claims: Patron has [% return_claims.count | html %] RETURN CLAIMS.</span></li>
                                     [% END %]
 
 
@@ -869,24 +869,60 @@
 
                                 [% IF WaitingHolds.count %]
                                     <div id="holdswaiting" class="circmessage">
-                                        <h4>Holds waiting:</h4>
+                                        [% SET waiting_here = 0 %]
+                                        [% SET waiting_elsewhere = 0 %]
                                         [% FOREACH w IN WaitingHolds %]
-                                            <ul>
-                                                <li>
-                                                    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
-                                                    ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
-                                                    [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
-                                                    [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
-                                                    Hold placed on [% w.reservedate | $KohaDates %].
+                                            [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode()  ) %]
+                                                [% waiting_here = waiting_here + 1 %]
+                                            [% ELSE %]
+                                                [% waiting_elsewhere = waiting_elsewhere + 1 %]
+                                            [% END %]
+                                        [% END %]
 
-                                                    <br/>
-                                                    [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode()  ) %]<strong class="waitinghere">[% ELSE %]<strong>[% END %]
-                                                        [% SET expires_on = w.expirationdate %]
-                                                        Waiting at [% w.branch.branchname | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
-                                                    </strong>
-                                                </li>
+                                        [% IF ( waiting_here > 0 ) %]
+                                            <h4>Holds waiting here ([% waiting_here | html %])</h4>
+                                            <ul>
+                                                [% FOREACH w IN WaitingHolds %]
+                                                    [% IF ( w.branch.branchcode == Branches.GetLoggedInBranchcode()  ) %]
+                                                        <li>
+                                                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
+                                                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
+                                                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
+                                                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
+                                                            Hold placed on [% w.reservedate | $KohaDates %].
+                                                            <br />
+                                                            <strong class="waitinghere">
+                                                                [% SET expires_on = w.expirationdate %]
+                                                                Waiting here [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
+                                                            </strong>
+                                                        </li>
+                                                    [% END %]
+                                                [% END %]
                                             </ul>
                                         [% END %]
+
+                                        [% IF ( waiting_elsewhere > 0 ) %]
+                                            <h4>Holds waiting at other libraries ([% waiting_elsewhere | html %])</h4>
+                                            <ul>
+                                                [% FOREACH w IN WaitingHolds %]
+                                                    [% IF ( w.branch.branchcode != Branches.GetLoggedInBranchcode()  ) %]
+                                                        <li>
+                                                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
+                                                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
+                                                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
+                                                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
+                                                            Hold placed on [% w.reservedate | $KohaDates %].
+                                                            <br />
+                                                            <strong>
+                                                                [% SET expires_on = w.expirationdate %]
+                                                                Waiting at [% w.branch.branchname | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
+                                                            </strong>
+                                                        </li>
+                                                    [% END %]
+                                                [% END %]
+                                            </ul>
+                                        [% END %]
+
                                     </div>
                                 [% END # /IF WaitingHolds.count %]