--- boards.txt~	2010-10-07 21:14:06.000000000 +0100
+++ hardware/arduino/boards.txt	2010-12-17 00:37:17.000000000 +0000
@@ -1,7 +1,7 @@
 ##############################################################
 
 uno.name=Arduino Uno
-uno.upload.protocol=stk500
+uno.upload.protocol=arduino
 uno.upload.maximum_size=32256
 uno.upload.speed=115200
 uno.bootloader.low_fuses=0xff