Due to the type of federalism applied in Germany the level of analysis best suited for studying integration is that of the 16 Länder. For comparing the approaches of two of these - Bavaria and Berlin - in managing migration-related diversity, the paper uses a double differentiation as analytical starting point. The first refers to the bulk of literature of different national models of integration and proposes two ideal types of integration/diversity policy. The second differentiation seizes the suggestion that integration in some areas of life is socially much more consequential than in others with the consequence that state intervention in these areas is much easier to justify from a normative point of view. From the descriptive comparison it becomes clear that both Länder, though coming from rather diverging starting points, by now employ hybrid strategies to accommodate or manage different aspects of cultural diversity.