Master Thesis deals with waterfront planning and design of heavily changed and neglected watercourse Gradaščica in Ljubljana from Vrhovci to Krakovo. The purpose of the task is to design the waterfront of Gradaščica as integrated park prospect which will be used for quality leisure time by the water. The task analyses the waterfront area of Gradaščica, explores the role of green surfaces and watercourses in the city, on the basis of which the principles of the design of the waterfront are developed. For the regulation of the space, individual areas are identified, which are then classified into the four categories of basic measures - to areas where there are no possible interventions, where there are possible minor interventions, major interventions and where there are possible drastic procedures. By taking into account these results, the initial purposes and the basic principles of the waterfront design, there has been created new programs in the waterfront area of Gradaščica with a main connecting link - a walking path surrounded with green corridor. The new programs, which string along the course, are diverse. These are a place for camping, recreation, a children's playground, an outdoor area of commercial and business buildings and educational institutions, cafes, a museum. In the conceptual design, interventions in the space seem minimal, but they are thought-out and have a big significance to the importance of watercourses, even the small ones, for the city.