Yes, water is always good. But, my Pulmonologist has me take Mucinex DM. It thins and loosens mucus, and controls cough. It has always helped me over the past 6 years. Also, avoid Dairy as much as possible. It builds phlem.
Stay away from colas, they produce phlegm and sing for a half hour. The exercise pulls phlegm out of our lungs without the use of medication. Constant singing helps with strengthening of the lungs and has been proven in a UK study to be somewhat successful.
lots of water
Water, water and more water. Stay away from dairy, that will make it thicker. Use a nebulizer if you have one. Hope this helps you. Take care and remember to breath deeply.