diff --git a/optiboot/bootloaders/optiboot/Makefile.extras b/optiboot/bootloaders/optiboot/Makefile.extras
index 996a740..0bb403c 100644
--- a/optiboot/bootloaders/optiboot/Makefile.extras
+++ b/optiboot/bootloaders/optiboot/Makefile.extras
@@ -102,6 +102,8 @@ atmega32_isp: isp
 #
 attiny84: TARGET = attiny84
 attiny84: MCU_TARGET = attiny84
+attiny84: LED_CMD ?= -DLED_START_FLASHES=0
+attiny84: AVR_FREQ ?= 8000000L
 attiny84: CFLAGS += $(COMMON_OPTIONS) -DSOFT_UART -DVIRTUAL_BOOT_PARTITION -Dsave_vect_num=4
 attiny84: LDSECTIONS = -Wl,--section-start=.text=0x1d00 -Wl,--section-start=.version=0x1ffe -Wl,--gc-sections -Wl,--undefined=optiboot_version
 attiny84: $(PROGRAM)_attiny84.hex
diff --git a/optiboot/bootloaders/optiboot/Makefile.tiny b/optiboot/bootloaders/optiboot/Makefile.tiny
index b3a5dcd..d80b8e5 100644
--- a/optiboot/bootloaders/optiboot/Makefile.tiny
+++ b/optiboot/bootloaders/optiboot/Makefile.tiny
@@ -1,6 +1,10 @@
 #-------------------------------
 # ATtiny 1634, Base instructions
 #-------------------------------
+
+HELPTEXT += "target attiny1634    - atttiny1634at<freq>  attiny1634at<freq>ser1\n"
+HELPTEXT += "                     - atttiny1634at8_5v  attiny1634at8_5vser1\n"
+
 attiny1634:	TARGET = attiny1634
 attiny1634:	MCU_TARGET = attiny1634
 attiny1634:	LED_CMD ?= -DLED=C0
@@ -106,6 +110,10 @@ attiny1634at147ser1:
 # ATtiny 841, base instructions
 #-------------------------------
 
+HELPTEXT += "target attiny841     - atttiny841at<freq>  attiny841at<freq>ser1\n"
+HELPTEXT += "                     - atttiny841at8_5v  attiny841at8_5vser1\n"
+HELPTEXT += "                     - atttiny841at<freq>noLED\n"
+
 attiny841: TARGET = attiny841
 attiny841: MCU_TARGET = attiny841
 attiny841: CFLAGS += $(COMMON_OPTIONS) '-DVIRTUAL_BOOT_PARTITION' '-DFOURPAGEERASE' $(UART_CMD)
@@ -133,12 +141,12 @@ attiny841at110:
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at921:
-	$(MAKE) attiny841	 AVR_FREQ=9216000L
+	$(MAKE) attiny841	 AVR_FREQ=9216000L BAUD_RATE=57600
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at737:
-	$(MAKE) attiny841	 AVR_FREQ=7372800L
+	$(MAKE) attiny841	 AVR_FREQ=7372800L BAUD_RATE=57600
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
@@ -158,19 +166,19 @@ attiny841at12:
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at8:
-	$(MAKE) attiny841	 AVR_FREQ=8000000L
+	$(MAKE) attiny841	 AVR_FREQ=8000000L BAUD_RATE=57600
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at8_5v:
-	$(MAKE) attiny841	 AVR_FREQ=8200000L
+	$(MAKE) attiny841	 AVR_FREQ=8200000L BAUD_RATE=57600
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 
 
 #-----------------------
-# ATtiny 841, UART 0 
+# ATtiny 841, UART 1
 #-----------------------
 attiny841at184ser1:
 	$(MAKE) attiny841	 AVR_FREQ=18432000L UART=1
@@ -188,12 +196,12 @@ attiny841at110ser1:
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at921ser1:
-	$(MAKE) attiny841	 AVR_FREQ=9216000L UART=1
+	$(MAKE) attiny841	 AVR_FREQ=9216000L BAUD_RATE=57600 UART=1
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at737ser1:
-	$(MAKE) attiny841	 AVR_FREQ=7372800L UART=1
+	$(MAKE) attiny841	 AVR_FREQ=7372800L BAUD_RATE=57600 UART=1
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
@@ -213,22 +221,56 @@ attiny841at12ser1:
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at8ser1:
-	$(MAKE) attiny841	 AVR_FREQ=8000000L UART=1
+	$(MAKE) attiny841	 AVR_FREQ=8000000L BAUD_RATE=57600 UART=1
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
+#-----------------------
+# ATtiny 841, UART 0, no LED
+# There's no noLED definitions for 1634 because the larger page size
+# on the 1634 means that you don't gain any usable flash from it. 
+#-----------------------
+
 attiny841at20noLED:
-	$(MAKE) attiny841	 AVR_FREQ=20000000L UART=1
+	$(MAKE) attiny841	 AVR_FREQ=20000000L LED_START_FLASHES=0
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at16noLED:
-	$(MAKE) attiny841	 AVR_FREQ=16000000L UART=1
+	$(MAKE) attiny841	 AVR_FREQ=16000000L LED_START_FLASHES=0
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
 attiny841at8noLED:
-	$(MAKE) attiny841	 AVR_FREQ=8000000L UART=1
+	$(MAKE) attiny841	 AVR_FREQ=8000000L  BAUD_RATE=57600 LED_START_FLASHES=0
 	mv $(PROGRAM)_attiny841.hex $(PROGRAM)_$@.hex
 	mv $(PROGRAM)_attiny841.lst $(PROGRAM)_$@.lst
 
+
+#-------------------
+# ATtiny828 - only one speed since it doesn't support crystal. 
+# If you want to use an external clock 
+#--------------------
+
+HELPTEXT += "target attiny828     - atttiny828at<freq>  attiny841at8_5v\n"
+
+attiny828: TARGET = attiny828
+attiny828: MCU_TARGET = attiny828
+attiny828: CFLAGS += $(COMMON_OPTIONS) '-DBAUD_RATE=57600'
+attiny828: AVR_FREQ ?= 8000000L
+attiny828: LDSECTIONS  = -Wl,--section-start=.text=0x1E00 -Wl,--section-start=.version=0x1ffe
+attiny828: $(PROGRAM)_attiny828.hex
+attiny828: $(PROGRAM)_attiny828.lst
+
+
+attiny828at8: 
+	$(MAKE) attiny828at8 AVR_FREQ=8000000L BAUD_RATE=57600
+	mv $(PROGRAM)_attiny828.hex $(PROGRAM)_$@.hex
+	mv $(PROGRAM)_attiny828.lst $(PROGRAM)_$@.lst
+
+attiny828at8_5v: 
+	$(MAKE) attiny828at8 AVR_FREQ=8200000L BAUD_RATE=57600
+	mv $(PROGRAM)_attiny828.hex $(PROGRAM)_$@.hex
+	mv $(PROGRAM)_attiny828.lst $(PROGRAM)_$@.lst
+
+
diff --git a/optiboot/bootloaders/optiboot/optiboot.c b/optiboot/bootloaders/optiboot/optiboot.c
index ea30529..5864fd6 100644
--- a/optiboot/bootloaders/optiboot/optiboot.c
+++ b/optiboot/bootloaders/optiboot/optiboot.c
@@ -1017,8 +1017,14 @@ static inline void writebuffer(int8_t memtype, addr16_t mybuff,
 	     * the serial link, but the performance improvement was slight,
 	     * and we needed the space back.
 	     */
+#ifdef FOURPAGEERASE
+	    if ((address.bytes[0] & ((SPM_PAGESIZE<<2)-1))==0) {
+#endif
 	    __boot_page_erase_short(address.word);
 	    boot_spm_busy_wait();
+#ifdef FOURPAGEERASE
+	    }
+#endif
 
 	    /*
 	     * Copy data from the buffer into the flash write buffer.