Patch originally from Nigel Cunningham and Pavel Machek. Cleaned up and 
converted to new system device API by your truly.