diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt
index 7e04bb3e6..c40779eac 100755
--- a/build/shared/lib/preferences.txt
+++ b/build/shared/lib/preferences.txt
@@ -284,4 +284,4 @@ serial.burn_rate=115200
 
 build.verbose=false
 
-board=diecimila
\ No newline at end of file
+board=atmega328
\ No newline at end of file
diff --git a/hardware/boards.txt b/hardware/boards.txt
index df14e896f..d9be01617 100644
--- a/hardware/boards.txt
+++ b/hardware/boards.txt
@@ -140,7 +140,7 @@ lilypad.build.core=arduino
 
 ##############################################################
 
-pro.name=Arduino Pro or Pro Mini (8 MHz)
+pro.name=Arduino Pro or Pro Mini (8 MHz) w/ ATmega168
 
 pro.upload.protocol=stk500
 pro.upload.maximum_size=14336
@@ -160,6 +160,26 @@ pro.build.core=arduino
 
 ##############################################################
 
+pro328.name=Arduino Pro or Pro Mini (8 MHz) w/ ATmega328
+
+pro328.upload.protocol=stk500
+pro328.upload.maximum_size=30720
+pro328.upload.speed=57600
+
+pro328.bootloader.low_fuses=0xFF
+pro328.bootloader.high_fuses=0xDA
+pro328.bootloader.extended_fuses=0x05
+pro328.bootloader.path=atmega
+pro328.bootloader.file=ATmegaBOOT_168_atmega328_pro_8MHz.hex
+pro328.bootloader.unlock_bits=0x3F
+pro328.bootloader.lock_bits=0x0F
+
+pro328.build.mcu=atmega328p
+pro328.build.f_cpu=8000000L
+pro328.build.core=arduino
+
+##############################################################
+
 atmega328.name=Arduino Duemilanove w/ ATmega328
 
 atmega328.upload.protocol=stk500
diff --git a/todo.txt b/todo.txt
index 28feef6e7..283b74063 100644
--- a/todo.txt
+++ b/todo.txt
@@ -17,7 +17,6 @@ Switch pwm output on pins 5 and 6 to phase-correct mode, if possible.
 Add parameter to shiftOut() for specifying a number of bits.
 Add parameter to Serial.print[ln](x, BIN) for specifying number of bits.
 Support PROGMEM strings in Serial.print(): http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1227919972
-Add support for ATmega1280 (e.g. timers, external interrupts, multiple serial ports).
 Add weak attribute to signal handlers: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1203798214
 Incorporate ladyada's new SoftwareSerial library.
 Floating point support in the map() function.
@@ -87,16 +86,12 @@ Change background color while using external editor: http://www.arduino.cc/cgi-b
 
 DEVELOPMENT
 
-Upgrade AVR tools to latest AVR MacPack - includes avr-gcc 4.3.2, which should fix interrupt problems.
-Upgrade AVR tools to latest WinAVR - includes avr-gcc 4.3.2.
 Add licenses for included open source libraries: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1234595391
 Make run.bat not open a command line window: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1223883872
 Update version of the FTDI drivers (Windows).
 Remove AVR ISP and giveio drivers (Windows).
 Include the executable installer for the FTDI drivers (Windows).
-Include newer version of avr-gcc (one that supports the ATmega1280).
 Revise fetch.sh to look for version specific pages (names suffixed with, e.g., "-0007")
-If possible, install bug tracking and svn on arduino.cc.
 Move to ant for build process.
 
 DOCUMENTATION / SITE CONFIGURATION