diff --git a/src/BaselineOfSmaCC/BaselineOfSmaCC.class.st b/src/BaselineOfSmaCC/BaselineOfSmaCC.class.st
index 7c735bde..0812cc93 100644
--- a/src/BaselineOfSmaCC/BaselineOfSmaCC.class.st
+++ b/src/BaselineOfSmaCC/BaselineOfSmaCC.class.st
@@ -12,6 +12,7 @@ BaselineOfSmaCC >> baseline: spec [
 		do: [ spec
 				package: 'SmaCC_Antlr_Parser' with: [ spec requires: 'SmaCC_GLR_Runtime' ];
 				package: 'SmaCC_CSV_Parser' with: [ spec requires: 'SmaCC_Runtime' ];
+				package: 'SmaCC_CPP_Parser' with: [ spec requires: 'SmaCC_GLR_Runtime' ];
 				package: 'SmaCC_CSharp' with: [ spec requires: 'SmaCC_GLR_Runtime' ];
 				package: 'SmaCC_C_Parser' with: [ spec requires: 'SmaCC_Runtime' ];
 				package: 'SmaCC_Delphi' with: [ spec requires: 'SmaCC_GLR_Runtime' ];
@@ -35,10 +36,11 @@ BaselineOfSmaCC >> baseline: spec [
 			spec
 				group: 'All'
 					with:
-					#('SmaCC_Antlr_Parser' 'SmaCC_CSV_Parser' 'SmaCC_CSharp' 'SmaCC_C_Parser' 'SmaCC_Delphi' 'SmaCC_Delphi_Forms' 'SmaCC_Generic_Smalltalk_Parser' 'SmaCC_Grammar_Parser' 'SmaCC_JSON_Parser' 'SmaCC_Java' 'SmaCC_Javascript_Parser' 'SmaCC_Line_Parser' 'SmaCC_Rewrite_Engine_Tests' 'SmaCC_Smalltalk_Parser' 'SmaCC_Source_Editing' 'SmaCC_Swift');
+					#('SmaCC_Antlr_Parser' 'SmaCC_CSV_Parser' 'SmaCC_CPP_Parser' 'SmaCC_CSharp' 'SmaCC_C_Parser' 'SmaCC_Delphi' 'SmaCC_Delphi_Forms' 'SmaCC_Generic_Smalltalk_Parser' 'SmaCC_Grammar_Parser' 'SmaCC_JSON_Parser' 'SmaCC_Java' 'SmaCC_Javascript_Parser' 'SmaCC_Line_Parser' 'SmaCC_Rewrite_Engine_Tests' 'SmaCC_Smalltalk_Parser' 'SmaCC_Source_Editing' 'SmaCC_Swift');
 				group: 'Runtime' with: #('SmaCC_Runtime');
 				group: 'GLR Runtime' with: #('SmaCC_GLR_Runtime');
 				group: 'Rewrites' with: #('SmaCC_Rewrite_Engine');
+				group: 'C++' with: #('SmaCC_CPP_Parser');
 				group: 'C#' with: #('SmaCC_CSharp');
 				group: 'Delphi' with: #('SmaCC_Delphi' 'SmaCC_Delphi_Forms');
 				group: 'Java' with: #('SmaCC_Java');
@@ -63,7 +65,7 @@ BaselineOfSmaCC >> baseline: spec [
 				package: 'SmaCC_Tests' with: [ spec requires: 'SmaCC_Development' ];
 				group: 'All'
 					with:
-					#('SmaCC_CSV_Parser' 'SmaCC_CSharp' 'SmaCC_C_Parser' 'SmaCC_Development' 'SmaCC_Debugging_Support' 'SmaCC_Delphi' 'SmaCC_Delphi_Forms' 'SmaCC_Development_UI' 'SmaCC_Generic_Smalltalk_Parser' 'SmaCC_JSON_Parser' 'SmaCC_Java' 'SmaCC_Javascript_Parser' 'SmaCC_Line_Parser' 'SmaCC_Parse_Tree_Comparison' 'SmaCC_Rewrite_Engine_Command_Line' 'SmaCC_Rewrite_Engine_Tests' 'SmaCC_Rewrite_Engine_UI' 'SmaCC_Rewrite_Server' 'SmaCC_Rewrite_Server_Worker' 'SmaCC_Smalltalk_Parser' 'SmaCC_Source_Editing' 'SmaCC_Swift' 'SmaCC_Tests');
+					#('SmaCC_CSV_Parser' 'SmaCC_CPP_Parser' 'SmaCC_CSharp' 'SmaCC_C_Parser' 'SmaCC_Development' 'SmaCC_Debugging_Support' 'SmaCC_Delphi' 'SmaCC_Delphi_Forms' 'SmaCC_Development_UI' 'SmaCC_Generic_Smalltalk_Parser' 'SmaCC_JSON_Parser' 'SmaCC_Java' 'SmaCC_Javascript_Parser' 'SmaCC_Line_Parser' 'SmaCC_Parse_Tree_Comparison' 'SmaCC_Rewrite_Engine_Command_Line' 'SmaCC_Rewrite_Engine_Tests' 'SmaCC_Rewrite_Engine_UI' 'SmaCC_Rewrite_Server' 'SmaCC_Rewrite_Server_Worker' 'SmaCC_Smalltalk_Parser' 'SmaCC_Source_Editing' 'SmaCC_Swift' 'SmaCC_Tests');
 				group: 'Tests' with: #('SmaCC_Rewrite_Engine_Tests' 'SmaCC_Tests');
 				group: 'Development' with: #('SmaCC_Development_UI') ]
 ]