diff --git a/ChangeLog b/ChangeLog
index 42fd9257..9ed7fe02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2004-07-07  Jan-Hinnerk Reichert  <hinni@despammed.com>
+	* NEWS, doc/TODO: Updated NEWS and TODO
+
 2004-07-07  Jan-Hinnerk Reichert  <hinni@despammed.com>
 	* stk500.c, term.c, doc/avrdude.texi, avrdude.1:
         added "sck"-command to the terminal mode.
diff --git a/NEWS b/NEWS
index 4c112321..a41f8b7b 100644
--- a/NEWS
+++ b/NEWS
@@ -8,23 +8,51 @@ Approximate change log for AVRDUDE by version.
 
 Current:
 
+  * Native Win32 support: The windows doesn't need Cygwin
+    anymore. Additionally, the delay timing on windows should be
+    more accurate now.
+    Contributed by Martin Thomas
+
+  * Add support for
+    - ATmega48, ATmega88 (contributed by Galen Seitz)
+    - ATtiny2313 (contributed by Bob Paddock)
+    - ATtiny13 (contributed by Pawel Moll)
+
+  * Added command to change the SCK of STK500-programmers. Now it
+    is possible to program uC with slow oscillator.
+    Contributed by Galen Seitz
+
+  * Baudrate for serial programmers (STK500 and AVR910) is
+    configurable in the config or at the command-line.
+    This way some more tweaked bootloaders and programmers can be used.
+
+  * Deprecated options have been removed.
+    Now the "-U" option must be used.
+
+Version 4.3.0:
+
+  * Added support for "Butterfly" evaluation board.
+
+  * Make cycle-count work with AVR910-programmers.
+
+  * Added "Troubleshooting"-Appendix to the manual.
+
   * Add ATmega8515 support.
     Contributed by: Matthias Weißer <matthias@matwei.de>
-  
+
   * Add ATmega64 support.
     Contributed by: Erik Christiansen <erik@dd.nec.com.au>
-  
+
   * Improved polling algorithm to speed up
     programming of byte oriented parallel programmers.
     Contributed by: Jan-Hinnerk Reichert <jan-hinnerk_reichert@hamburg.de>
-  
+
   * Add "fuse" and "lock" definitions for the AT90S8535.
-  
+
   * STK500 skips empty pages in paged write resulting in faster downloads
     when there are empty blocks in between code (such as files that contain
     application code and bootloader code).
 
-
 Version 4.2.0:
 
   * Add basic support for reading and writing fuses via SPI with avr910
diff --git a/doc/TODO b/doc/TODO
index 76eebd95..6c57c5ad 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -4,21 +4,23 @@
 - Website needs to link to docs:
   http://savannah.nongnu.org/download/avrdude/doc/avrdude-html/
 
-- [Windows Port] Use Windows API for serial port communications (ser_win32.c).
-  (In Progress)
-
 - Add "skip empty pages" optimization on avr910 paged write. The stk500 has
   this optimization already.
 
 - Fix "overfull \hbox" issues in building documentation.
 
-- FIXME: term.c: terminal_get_input(): strip newlines in non-readline input 
+- FIXME: term.c: terminal_get_input(): strip newlines in non-readline input
   code.
 
 - FIXME: avr910.c: avr910_cmd(): Insert version check here.
 
-- FIXME: ser_posix.c: serial_close(): Should really restore the terminal to 
+- FIXME: ser_posix.c: serial_close(): Should really restore the terminal to
   original state here.
 
 - FIXME: main.c, par.c: exitspecs don't work if RESET-pin is controlled over
   PPICTRL.
+
+- transfer ppi-speedtuning to the windows version (CAVEAT: This will make
+  programming too fast for chips with 500kHz clock)
+
+- make SCK-period configurable for PPI-programmers