Yeah, I got one of those recently too - got diesel all over my hands in the process.
Go to http://www.solar1234.com, a few links down he has a fuel storage interview he did.
Simple manual siphon XFer pump and blue barrels are the key.
I bough some flexible metal funnels and put those into the fuel filler and then remove the spout and pour directly from the can. No spills.
Thanks! FRegards.