Abstract--Mapping and localization for indoor robotic navigation is a well-studied field. However, existing work largely relies on long range perceptive sensors in addition to the robot's odometry, and little has been done with short range sensors. In this paper, we propose a method for real-time indoor mapping using only short range sensors such as bumpers and/or wall sensors that enable wall-following. The method uses odometry data from the robot's wall-following trajectory, together with readings from bumpers and wall sensors. The method first performs trace segmentation by fitting line segments to the noisy trajectory. Given the assumption of approximately rectilinear structure in the floor plans, typical for most indoor environments, a probabilistic rectification process is then applied to the segmented traces to obtain the orthogonal wall outlines. Both segmentation and rectification are performed on-line onboard the robot during its navigation through the environment. ...