[en] We enumerate self-avoiding walks and polygons, counted by perimeter, on the quasiperiodic rhombic Penrose and Ammann-Beenker tilings, thereby considerably extending previous results. In contrast to similar problems on regular lattices, these numbers depend on the chosen initial vertex. We compare different ways of counting and demonstrate that suitable averaging improves convergence to the asymptotic regime. This leads to improved estimates for critical points and exponents, which support the conjecture that self-avoiding walks on quasiperiodic tilings belong to the same universality class as self-avoiding walks on the square lattice. For polygons, the obtained enumeration data do not allow us to draw decisive conclusions about the exponent