Due to demographic changes, globalisation and increased migration processes, institutions of higher education are, in particular, assigned new responsibilities. The fight for the most qualified people demands new strategies and concepts. Technical universities that are traditionally male dominated and where women and minorities are under-represented in almost all areas are facing these challenges with an increasing urgency. For an excellent performance, these institutions need diverse people who are equally included and promoted within the educational system. With the establishment of the scientific unit "Integration Team--Human Resources, Gender and Diversity Management", RWTH Aachen University is proactively dealing with these issues. The following contribution describes the institutional integration of gender and diversity management at a technical university with special emphasis on measures and activities in research and teaching, aiming at tackling the under-representation of women and minorities in science and technology.