diff --git a/Installation/include/CGAL/license/generate_files.cmake b/Installation/include/CGAL/license/generate_files.cmake
index 6a565f7fb32..39f43f57169 100644
--- a/Installation/include/CGAL/license/generate_files.cmake
+++ b/Installation/include/CGAL/license/generate_files.cmake
@@ -2,7 +2,8 @@ file(STRINGS gpl_package_list.txt package_list)
 
 foreach(LINE ${package_list})
   string(REGEX MATCH "^[^ ]*" PACKAGE_NAME ${LINE})
-  string(TOUPPER ${PACKAGE_NAME} PACKAGE_CODE_NAME)
+  string(REPLACE "/" "_" PACKAGE_CODE_NAME ${PACKAGE_NAME})
+  string(TOUPPER ${PACKAGE_CODE_NAME} PACKAGE_CODE_NAME)
   string(REPLACE "${PACKAGE_NAME}" "" PACKAGE_PRETTY_NAME ${LINE})
   string(STRIP "${PACKAGE_PRETTY_NAME}" PACKAGE_PRETTY_NAME)
   message("Generate \"${PACKAGE_NAME}.h\"")
diff --git a/Installation/include/CGAL/license/gpl_package_list.txt b/Installation/include/CGAL/license/gpl_package_list.txt
index 550b4f3aad8..56707d64968 100644
--- a/Installation/include/CGAL/license/gpl_package_list.txt
+++ b/Installation/include/CGAL/license/gpl_package_list.txt
@@ -40,6 +40,17 @@ Point_set_processing_3 Point Set Processing
 Point_set_shape_detection_3 Point Set Shape Detection
 Poisson_surface_reconstruction_3 Poisson Surface Reconstruction
 Polygon_mesh_processing Polygon Mesh Processing
+Polygon_mesh_processing/Compute_normal Polygon Mesh Processing - Normal Computation
+Polygon_mesh_processing/connected_components Polygon Mesh Processing - Connected Components
+Polygon_mesh_processing/corefinement Polygon Mesh Processing - Corefinement
+Polygon_mesh_processing/core Polygon Mesh Processing - Core
+Polygon_mesh_processing/distance Polygon Mesh Processing - Distance
+Polygon_mesh_processing/measure Polygon Mesh Processing - Geometric Measure
+Polygon_mesh_processing/meshing_hole_filling Polygon Mesh Processing - Meshing and Hole Filling
+Polygon_mesh_processing/orientation Polygon Mesh Processing - Orientation
+Polygon_mesh_processing/predicate Polygon Mesh Processing - Predicate
+Polygon_mesh_processing/repair Polygon Mesh Processing - Repair
+Polygon_mesh_processing/miscellaneous Polygon Mesh Processing - Miscellaneous
 Polyhedron 3D Polyhedral Surface
 Polyline_simplification_2 2D Polyline Simplification
 Polytope_distance_d Optimal Distances