diff --git a/Manual/doc_tex/Manual/manual.bib b/Manual/doc_tex/Manual/manual.bib
index 1b641ddb13d..3461eff4038 100644
--- a/Manual/doc_tex/Manual/manual.bib
+++ b/Manual/doc_tex/Manual/manual.bib
@@ -356,7 +356,7 @@
 , title =	"Interpolation"
 , editor =	"CGAL Editorial Board"
 , booktitle =	"CGAL-3.2 User and Reference Manual"
-, url =	"http://www.cgal.org/Manual/3.2/doc_html/cgal_manual/pkgdescription.html#Pkg:Interpolation2"
+, url =	"http://www.cgal.org/Manual/3.2/doc_html/cgal_manual/pkgdescription.html#Pkg:Optimisation"
 , year =        2006
 }
 
diff --git a/Manual/doc_tex/cgal_manual.tex b/Manual/doc_tex/cgal_manual.tex
index 37135b38438..956f2b923ee 100644
--- a/Manual/doc_tex/cgal_manual.tex
+++ b/Manual/doc_tex/cgal_manual.tex
@@ -27,7 +27,7 @@
 \setcounter{page}{1}
 
 \cgalchapters{
-    \entry{\part{General Introduction}}
+    \entry{\part{General Introduction \label{Part:GeneralIntroduction}}}
 
     \lcTex{\entryright{\listofrefpages}}
 
@@ -36,7 +36,7 @@
 % The Kernel:
 % -----------
 
-    \entry{\part{Kernels}}
+    \entry{\part{Kernels\label{Kernels}}}
 
     \packageleftright{Kernel_23}{Kernel_23_ref}
     \packageleftright{Kernel_d}{Kernel_d_ref}
@@ -48,14 +48,14 @@
 % The Basic Library:
 % ------------------
 
-    \entry{\part{Convex-Hull Algorithms}}
+    \entry{\part{Convex-Hull Algorithms\label{Part:ConvexHullAlgorithms}}}
 
     \packageleftright{Convex_hull_2}{Convex_hull_2_ref}
     \packageleftright{Convex_hull_3}{Convex_hull_3_ref}
     \packageleftright{Convex_hull_d}{Convex_hull_d_ref}
 
 
-    \entry{\part{Polygons and Polyhedra}}
+    \entry{\part{Polygons and Polyhedra\label{Part:PolygonsAndPolyhedra}}}
 
     \packageleftright{Polygon}{Polygon_ref}
     \packageleftright{Partition_2}{Partition_2_ref}
@@ -63,7 +63,7 @@
     \packageleftright{HalfedgeDS}{HalfedgeDS_ref}
 
 
-    \entry{\part{Polygon and Polyhedron Operations}}
+    \entry{\part{Polygon and Polyhedron Operations\label{Part:PolygonAndPolyhedraOperations}}}
 
     \packageleftright{Boolean_set_operations_2}{Boolean_set_operations_2_ref}
     \packageleftright{Nef_2}{Nef_2_ref}
@@ -72,14 +72,14 @@
     \packageleftright{Straight_skeleton_2}{Straight_skeleton_2_ref}
 
 
-    \entry{\part{Arrangements}}
+    \entry{\part{Arrangements\label{Part:Arrangements}}}
 
     \packageleftright{Arrangement_2}{Arrangement_2_ref}
     \packageleftright{Sweep_line_2}{Sweep_line_2_ref}
     \packageleftright{Snap_rounding_2}{Snap_rounding_2_ref}
 
 
-    \entry{\part{Triangulations and Delaunay Triangulations}}
+    \entry{\part{Triangulations and Delaunay Triangulations\label{Part:Triangulations}}}
 
     \packageleftright{Triangulation_2}{Triangulation_2_ref}
     \packageleftright{TDS_2}{TDS_2_ref}
@@ -89,14 +89,14 @@
     \packageleftright{Alpha_shapes_3}{Alpha_shapes_3_ref}
 
 
-    \entry{\part{Voronoi Diagrams}}
+    \entry{\part{Voronoi Diagrams\label{Part:VoronoiDiagrams}}}
 
     \packageleftright{Segment_Delaunay_graph_2}{Segment_Delaunay_graph_2_ref}
     \packageleftright{Apollonius_graph_2}{Apollonius_graph_2_ref}
     \packageleftright{Voronoi_diagram_2}{Voronoi_diagram_2_ref}
 
 
-    \entry{\part{Meshing}}
+    \entry{\part{Meshing\label{Part:Meshing}}}
 
     \packageleftright{Mesh_2}{Mesh_2_ref}
     \packageleftright{Surface_mesher}{Surface_mesher_ref}
@@ -105,7 +105,7 @@
     \packageleftright{Surface_mesh_parameterization}{Surface_mesh_parameterization_ref}
 
 
-    \entry{\part{Search Structures}}
+    \entry{\part{Search Structures\label{Part:SearchStructures}}}
 
     \packageleftright{Point_set_2}{Point_set_2_ref}
     \packageleftright{Interval_skip_list}{Interval_skip_list_ref}
@@ -114,24 +114,24 @@
     \packageleftright{Box_intersection_d}{Box_intersection_d_ref}
 
 
-    \entry{\part{Geometric Optimization}}
+    \entry{\part{Geometric Optimization\label{Part:Optimisation}}}
 
     \packageleftright{Optimisation}{Optimisation_ref}
     \packageleftright{Principal_component_analysis}{Principal_component_analysis_ref}
 
 
-    \entry{\part{Interpolation}}
+    \entry{\part{Interpolation\label{Part:Interpolation}}}
 
     \packageleftright{Interpolation}{Interpolation_ref}
     \packageleftright{Stream_lines_2}{Stream_lines_2_ref}
 
-    \entry{\part{Kinetic Data Structures}}
+    \entry{\part{Kinetic Data Structures\label{Part:KineticDataStructures}}}
     \packageleftright{Kinetic_data_structures}{Kinetic_data_structures_ref}
     \packageleftright{Kinetic_framework}{Kinetic_framework_ref}
 
 % The Support Linrary:
 
-    \entry{\part{Support Library}}
+    \entry{\part{Support Library\label{Part:SupportLibrary}}}
 
     \packageleftright{NumberTypeSupport}{NumberTypeSupport_ref}
     \packageleftright{STL_Extension}{STL_Extension_ref}