This paper extends a replacement model based on failure number to include a repair-cost limit for general failure distributions. The stochastic behaviour of failures and repair costs are modelled by a non-homogeneous Poisson process. An efficient marginal analysis algorithm is presented for finding the optimal failure number for replacement that minimizes the average cost rate.