diff --git a/AUTHORS b/AUTHORS
index 771b9081..8751db9f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
 AVRDUDE was written by:
 
-	Brian S. Dean  <bsd@bsdhome.com>.
+	Brian S. Dean  <bsd@bdmicro.com>
 
 Contributors:
 
@@ -11,6 +11,7 @@ Contributors:
 	Martin Thomas <mthomas@rhrk.uni-kl.de>
 	Theodore A. Roth <troth@openavr.org>
 	Michael Holzt <kju-avr@fqdn.org>
+	Colin O'Flynn <coflynn@newae.com>
 
 For minor contributions, please see the ChangeLog files.
 
diff --git a/ChangeLog b/ChangeLog
index 6069b1ef..a5f0fc00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005/09/21  Brian S. Dean  <bsd@bsdhome.com>
+
+	* avr.c:
+	* main.c:
+	* safemode.c:
+	* safemode.h:
+	* term.h:
+	  This is Colin O'Flynn's mega patch for updating safemode support:
+	  
+	  * add support for parts with just 'fuse' memory
+	  
+	  * if any fuse memories are altered, reflect those changes in the
+	  post-programming safemode check so that safemode no longer
+	  complains about fuses which were intentionally altered; this
+	  eliminates the need to completely disable safemode using -u in
+	  order to program fuses.
+	  
+	  * provide -s option which will not ask to restore fuses, it will
+	  just do it
+
 2005-09-19  Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* butterfly.c (butterfly_initialize): make the device code unsigned so