Waynesboro (formerly Flack), is an independent city in the U.S. state of Virginia. As of the 2010 census, the population was 21,006. The city is surrounded by Augusta County and is named for General Anthony Wayne.