A diagnostic beamline is being constructed in the PLS storage ring for measurement of electron- and photon-beam properties. It consists of two 1:1 imaging systems: a visible-light imaging system and a soft X-ray imaging system. In the visible-light imaging system, the transverse beam size and beam position are measured with various detectors: a CCD camera, two photodiode arrays and a photon-beam position monitor. Longitudinal bunch structure is also investigated with a fast photodiode detector and a picosecond streak camera. On the other hand, the soft X-ray imaging system is under construction to measure beam sizes with negligible diffraction-limited error. The X-ray image optics consist of a flat cooled mirror and two spherical focusing mirrors.