Sleeping problems at 1 yr old - advice needed

My little boy Daniel is now 1 year old and I've just returned to work after maternity leave. However he still is waking during the night - usually between 2 and 3 am. I'm still breastfeeding him although this is at night when I get him off to sleep and first thing in the morning. I'm quite happy to continue this at the moment. However, right or wrong, when he wakes at night I put him to the breast and he has some milk before he goes back to sleep. I usually keep him in with me after that as I have trouble getting him back in his cot.

I really want him to sleep through the night. He has done occassionally, very rarely though. How can I get him to sleep through the night? Someone at work said offer him water when he wakes during the night, but I think its mainly a comfort thing that he wants the breast as he does tend to use me as a dummy (his dad wouldn't let me give him a dummy, that's another story!).

He is sharing a bedroom with me at the moment as I need to move to a bigger place. In the meantime he will have to share with me for the foreseeable future.

Has anyone got any suggestions how I can get him to sleep through the night? I'd really like to get him sleeping through the night before his dad comes back from France (about 2 wks time).

I'd be gratefully for any suggestions or advice anyone can offer. My other 2 boys (now 18 and 14) both slept through the night from about 6months of age, so I never had this problem before.

Thanks in advance
Sarah and 1 year old Daniel Peanut!