diff --git a/Manual/developer_scripts/cgal_manual b/Manual/developer_scripts/cgal_manual
index fad0e415b46..13874c62b43 100755
--- a/Manual/developer_scripts/cgal_manual
+++ b/Manual/developer_scripts/cgal_manual
@@ -577,14 +577,14 @@ EOF
     if [ $# -eq 1 ]; then
         if [[ $1 == *_ref ]]; then
             echo "    %\entryleft{\part{Reference Manual}}"
-            echo "    \lcTex{\entryleft{\listofrefpages}}"
+            #echo "    \lcTex{\entryleft{\listofrefpages}}"
         else
             echo "    %\entryleft{\part{User Manual}}"
         fi
         echo "    \packageleft{$1}"
     else
         echo "    %\entryleftright{\part{User Manual}}{\part{Reference Manual}}"
-        echo "    \lcTex{\entryright{\listofrefpages}}"
+        #echo "    \lcTex{\entryright{\listofrefpages}}"
         echo "    \packageleftright{$1}{$2}"
     fi
     cat <<EOF
@@ -606,6 +606,7 @@ EOF
 cleanup_latex() {
     rm -f $1.toc $1.bmt $1.mtc* $1.idx $1.ind $1.dvi $1.inc $1.out $1.ref
     rm -f $1.ind.unfixed
+    #find . -name "listofrefpages.tex" | while read f ; do rm $f; done
     if [ $MakeHTML -eq 0 ]; then
         rm -f $1.aux $1.bbl
     fi
@@ -709,10 +710,10 @@ testsuite_entry() {
 #---------------------------------------------------------------------#
 
 sort_ref_pages() {
-    if [ -f $1.ref ]; then
-        cmdlog "${Sort} -f +2 -3 $1.ref > $1.ref_sorted"
-        cmdlog "mv $1.ref_sorted $1.ref"
-    fi
+    find . -name "listofrefpages.tex" | while read f ; do
+      cmdlog "${Sort} -f $f > $f.sorted" # +2 -3 what was this used for?
+      cmdlog "mv $f.sorted $f"
+    done
 }
 
 #---------------------------------------------------------------------#
@@ -1453,18 +1454,18 @@ make_manual_prime() {
               ln -s ../../../include .
               linklint -doc ../${WrapperRootName}-linklintresults -index contents.html -no_anchors /@  >& /dev/null
               cd ../..
-              
+
               search_and_replace testsuite/${WrapperRootName}-linklintresults/ "*.html" 'file:.\+doc_tex\/testsuite\/' '..\/'
-              
+
               if grep 'No errors,' testsuite/${WrapperRootName}-linklintresults/log.txt >& /dev/null; then
                   LinklintExit=0
                   if ! grep 'no warnings.' testsuite/${WrapperRootName}-linklintresults/log.txt >& /dev/null; then
                      LinklintExit=2
                   fi
-              else 
+              else
                   LinklintExit=1
               fi
-          fi 
+          fi
       fi
     fi
     if [ $MakeTestSuiteResult -eq 1 ]; then
diff --git a/Manual/doc_tex/Manual/cgal_manual.sty b/Manual/doc_tex/Manual/cgal_manual.sty
index 4f563fdb070..99b6a880461 100644
--- a/Manual/doc_tex/Manual/cgal_manual.sty
+++ b/Manual/doc_tex/Manual/cgal_manual.sty
@@ -275,7 +275,7 @@
     \renewcommand{\packageleftright}[2]{%
       \gdef\ccCurrentFilename{##1}%
       \cgalreinit\include{##1/main}%
-      \gdef\ccCurrentFilename{##1}%
+      \gdef\ccCurrentFilename{##2}%
       \cgalreinit\include{##2/main}%
     }%
     #1