Systems and methods are provided for collecting and using user-contributed map data. In one implementation, a computer-implemented method is provided for collecting maneuver-specific annotations. According to the method, a user is presented with a set of computer-generated driving directions comprising a plurality of maneuvers. In association with presenting to the user the set of driving directions, the method presents to the user an option to submit an annotation for one of the plurality of maneuvers. In response to presenting the option to the user, the annotation is received from the user and stored in association with an identification of the one of the plurality of maneuvers. The stored annotation may be incorporated in the set of computer-generated driving directions.