diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/RaceLogServletConstants.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/RaceLogServletConstants.java
index 7c0541fd099..8e3018e2e59 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/RaceLogServletConstants.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/RaceLogServletConstants.java
@@ -14,4 +14,5 @@ public interface RaceLogServletConstants {
     static final String PARAMS_COURSE_AREA_FILTER = "courseArea";
     static final String PARAMS_TRACK_WIND = "trackWind";
     static final String PARAMS_CORRECT_WIND_DIRECTION_BY_MAGNETIC_DECLINATION = "correctWindDirectionByMagneticDeclination";
+    static final String PARAMS_TRACKED_RACE_NAME = "trackedRaceName";
 }
diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
index 21527af2258..2301827fc39 100755
--- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
+++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
@@ -632,6 +632,7 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource {
             @QueryParam(RaceLogServletConstants.PARAMS_RACE_FLEET_NAME) String fleetName,
             @QueryParam(RaceLogServletConstants.PARAMS_TRACK_WIND) Boolean trackWind,
             @QueryParam(RaceLogServletConstants.PARAMS_CORRECT_WIND_DIRECTION_BY_MAGNETIC_DECLINATION) Boolean correctWindDirectionByMagneticDeclination,
+            @QueryParam(RaceLogServletConstants.PARAMS_TRACKED_RACE_NAME) String optionalTrackedRaceName,
             @QueryParam("secret") String secret)
                     throws NotDenotedForRaceLogTrackingException, Exception {
         final LeaderboardAndRaceColumnAndFleetAndResponse leaderboardAndRaceColumnAndFleetAndResponse = getLeaderboardAndRaceColumnAndFleet(
@@ -649,7 +650,7 @@ public class LeaderboardsResource extends AbstractLeaderboardsResource {
                 jsonResult.put("addeddenotation", adapter.denoteRaceForRaceLogTracking(getService(),
                         leaderboardAndRaceColumnAndFleetAndResponse.getLeaderboard(),
                         leaderboardAndRaceColumnAndFleetAndResponse.getRaceColumn(),
-                        leaderboardAndRaceColumnAndFleetAndResponse.getFleet(), /* use default race name */ null));
+                        leaderboardAndRaceColumnAndFleetAndResponse.getFleet(), optionalTrackedRaceName));
                 final RaceHandle raceHandle = adapter.startTracking(getService(), leaderboardAndRaceColumnAndFleetAndResponse.getLeaderboard(),
                         leaderboardAndRaceColumnAndFleetAndResponse.getRaceColumn(),
                         leaderboardAndRaceColumnAndFleetAndResponse.getFleet(),
diff --git a/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceStartTracking.html b/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceStartTracking.html
index e7545a72d8d..315d537ebeb 100755
--- a/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceStartTracking.html
+++ b/java/com.sap.sailing.server.gateway/webservices/api/v1/leaderboardRaceStartTracking.html
@@ -36,6 +36,8 @@ Wind tracking can be configured using optional request parameters.</p>
 			<div>correctWindDirectionByMagneticDeclination a boolean value, defaulting to true; if trackWind is true,
 			     this parameter controls whether the wind directions received are to be corrected by the magnetic
 			     declination</div>
+			<div>trackedRaceName can be used to specify a non-default name for the tracked race / RaceDefinition; if not
+                             provided, a default name consisting of race column and fleet name will be constructed instead.</div>
 		</td>
 	</tr>
 	<tr>