Advances in autonomous driving and robotics are creating high demand for inexpensive and mass-producible distance sensors. A laser ranging system (Lidar), based on the frequency-modulated continuous-wave (FMCW) method is built in this work. The benefits of an FMCW Lidar system are the low-cost components and the performance in comparison to conventional time-of-flight Lidar systems. The basic system consists of a DFB laser diode (λ= 1308 nm) and an asymmetric fiber-coupled Mach-Zehnder interferometer with a fixed delay line in one arm. Linear tuning of the laser optical frequency via injection current modulation creates a beat signal at the interferometer output. The frequency of the beat signal is proportional to the optical path difference in the interferometer. Since the laser frequency-to-current response is non-linear, a closed-loop feed-back system is designed to improve the tuning linearity, and consequently the measurement resolution. For fast active control, an embedded system with FPGA is used, resulting in a nearly linear frequency tuning, realizing a narrow peak in the Fourier spectrum of the beat signal. For free-space measurements, a setup with two distinct interferometers is built. The fully fiber-coupled Mach-Zehnder reference interferometer is part of the feed-back loop system, while the other - a Michelson interferometer - has a free-space arm with collimator lens and reflective target. A resolution of 2:0 mm for a 560 mm distance is achieved. The results for varying target distances show high consistency and a linear relation to the measured beat-frequency.