This article reports on research on secondary-school teachers and dilemmas they encounter in their work in multi-ethnic schools in the Netherlands. The results of a recent study based on interviews are compared with a survey conducted in 1996. This showed that in a changing societal context, that can be characterized by mounting selection and marketization and the hardening of the debate on integration, the accent in the dilemmas teachers experience have shifted and new dilemmas have emerged. The balance in communality and diversity in schools is subject of concern to teachers. This outcome is discussed in relation to specific characteristics of teachers' professionalism.