This paper describes the design of a new Maori, early childhood, immersion teaching diploma program at the University of Waikato (New Zealand). The program incorporates a strong focus on developing both the adult students' fluency in Maori, as a second language, and their skills for facilitating fluency in young children, many of whom will also be learning it as a second language. For 3 years, student teachers are required to develop competence in the theory and practice of early childhood education, to become fluent in Te Reo Maori, and to learn the pedagogy and skills for developing young children's Maori as a second language; Maori perspectives and culture will also be taught. The course, based on an existing early childhood education program, now includes theory of second language learning and language revitalization. The Maori program is only a pilot program and will be evaluated and revised as needed. Challenges in the program appear to be the lack of written Maori materials for learning and lack of proficient Maori speakers to teach the student teachers. (Contains 31 references.) (NAV)