Changes made by Anton de Wet (ascii@icenium.phun.net).
update to device id