What amount have you been depreciating? If you have been depreciating the correct amount, that should be the starting basis, and you add any improvements to that.
If you are not sure, I agree with pk, a tax professional may be a good idea, and be sure to bring your tax return from the year of the 1031 exchange (specifically, Form 8824).
