The present invention relates to inhibitors of VAP-1 and their use as medicaments in treating fibrotic conditions. Furthermore, the present invention relates to a method of diagnosing a fibrotic condition on the basis of elevated level of soluble VAP-1 or SSAO activity in a bodily fluid, and to a kit for use in said diagnostic method.