Modern architecture takes advantage of the greatly increasing design possibilities. Yet, architects are not just a new group of CAD users. Scale and construction technologies pose new challenges to engineering and design. We are convinced that those can be met more effectively with a solid understanding of geometry. Thus, an academic CAAD curriculum has to meet these requirements. We introduce our approach taken at TU Vienna and focus on the first-term mandatory course on geometry for architecture.