TDS on salary & Form 16

A company registered in Maharashtra in 2007 has shifted its registered office in September 2010 to Gujarat (Baroda). It has TDS no. of Maharashtra (Mumbai) and has deposited and files return in form 26Q and 24Q for first two quarter. As registered office change TIN centre advice to take new TAN no. at Baroda and surrender TAN of Mumbai.

Now and onwards the TDS will deposited in new TAN no of Baroda. The question is how salary certificate (Form 16) to issue? Whether two form 16 to issue or there is any alternate way?