A hydrodynamic, water temperature, and water-quality model of the Link River to Keno Dam reach of the upper Klamath River was updated to account for macrophytes and enhanced pH buffering from dissolved organic matter, ammonia, and orthophosphorus. Macrophytes had been to provide a dataset to guide the inclusion of macrophytes in the model. Three types of macrophytes were most common: pondweed (Potamogeton species), coontail (Ceratophyllum demersum), and common waterweed (Elodea canadensis). Pondweed was found throughout the Link River to Keno Dam reach in early summer with densities declining by mid-summer and fall. Coontail and common waterweed were more common in the lower reach near Keno Dam and were at highest density in summer. All species were most dense in shallow water (less than 2 meters deep) near shore. The highest estimated dry weight biomass for any sample during the study was 202 grams per square meter for coontail in incorporated into the CE-QUAL-W2 model for calendar years 2006-09. The CE-QUAL-W2 model code was adjusted to allow the user to initialize macrophyte populations spatially across the model grid.