Komaki (小牧市, Komaki-shi) is a city located in Aichi Prefecture, Japan.
As of May 2015, the city had an estimated population of 147,149 and a population density of 2,340 persons per km². The total area was 62.82 square kilometres (24.25 sq mi).
It is commonly associated with the former Nagoya Airport, which is located between Komaki and neighboring Kasugai.
Komaki is located in west-central Aichi Prefecture, north of the Nagoya metropolis.
During the Sengoku period, the area surrounding Mount Komaki was the site of the Battle of Komaki and Nagakute in 1584. It was part of the holdings of Owari Domain during the Edo period. During the Meiji period, the area was organized into villages under Higashikasugai District, Aichi. Komaki was proclaimed a town on July 16, 1906. Komaki was raised to city status on January 1, 1955, after merging with the village of Kitasato in Nishikasugai District, Aichi.