Discipline in schools has become a serious issue in South Africa; as in other countries. Several attempts have been made to improve learner discipline as a foundation of the current education system. These included the formulation of the South African Schools Act which provides a framework within which discipline, values and human rights are supposed to be aligned. Thus, the question is how do teacher-education institutions prepare student teachers? This article, therefore, reports on a case study that was conducted at the University of Limpopo. Data was generated from semi-structured interviews with 10 student-teachers, two lecturers, the coordinator of the programme and documents consulted. The study found that the way in which the university prepares student teachers for disciplinary issues in schools is not adequate for them to be able to deal with disciplinary issues and recommendations are made to improve the situation.