This paper provides a systematic approach for the design of buffer tanks. We consider mainly the case where the objective of the buffer tank is to dampen ("average out") the fast (i.e., high-frequency) disturbances, which cannot be handled by the feedback control system. We consider separately design procedures for (I) mixing tanks to dampen quality disturbances and (II) surge tanks with averaging level control to handle flow-rate disturbances.