If I have a servicemark, but decide later to offer goods, do I need to get a trademark as well?

Trademarks are for offering goods, and Servicemarks are for offering services. What if I have a registered servicemark, for an organization which offers services, but decide in the future, to start offering goods as well? Would i still be covered/protected under the servicemark, or would I have to apply for trademark?