How can I keep my Papillon dry and not smelly?

With all that hair underneath and on the legs, my Papillon wets on himself. I hate to pick him up and he smells like urine except for the first hour after a bath. Other than shaving off all his cute "feathers" do you have any suggestions?