The invention provides an apparatus and a method of performing X-ray diffraction (XRD) and/or X-ray fluorescence (XRF) analysis of a sample, comprising: irradiating a sample with X-rays from an X-ray source; providing a combined XRD and XRF detection arrangement comprising a scanning wavelength selector and at least one X-ray detector for detecting X-rays selected by the wavelength selector; and performing XRD analysis of the sample by selecting at least one fixed wavelength of X-rays diffracted by the sample using the scanning wavelength selector and detecting X-rays of the selected fixed wavelength(s) at one or more values of the diffraction angle φ at the sample using the X-ray detector(s); and/or performing XRF analysis of the sample by scanning wavelengths of X-rays emitted by the sample using the scanning wavelength selector and detecting X-rays of the scanned wavelengths using the X-ray detector(s).