diff --git a/optiboot/bootloaders/optiboot/parse_options.mk b/optiboot/bootloaders/optiboot/parse_options.mk
index fde6abb..a75884d 100644
--- a/optiboot/bootloaders/optiboot/parse_options.mk
+++ b/optiboot/bootloaders/optiboot/parse_options.mk
@@ -81,7 +81,7 @@ dummy = FORCE
 endif
 
 HELPTEXT += "Option LED_INVERT=1          - Invert the 'on' state of the LED\n"
-ifdef LED_INVERT=1
+ifdef LED_INVERT
 ifneq ($(LED_INVERT), 0)
 LEDINV_CMD = -DLED_INVERT=1
 endif
@@ -137,7 +137,7 @@ endif
 HELPTEXT += "Option AVR_FREQ=<n>          - Clock rate of AVR CPU\n"
 
 
-LED_OPTIONS = $(LED_START_FLASHES_CMD) $(LED_DATA_FLASH_CMD) $(LED_CMD) $(LED_START_ON_CMD)
+LED_OPTIONS = $(LED_START_FLASHES_CMD) $(LED_DATA_FLASH_CMD) $(LED_CMD) $(LED_START_ON_CMD) $(LEDINV_CMD)
 CPU_OPTIONS = $(RESETPIN_CMD) $(TIMEOUT_CMD) $(FCPU_CMD)
 COMMON_OPTIONS =  $(BIGBOOT_CMD) $(APPSPM_CMD) $(VERSION_CMD)
 COMMON_OPTIONS += $(SUPPORT_EEPROM_CMD)
diff --git a/optiboot/bootloaders/optiboot/pin_defs_x.h b/optiboot/bootloaders/optiboot/pin_defs_x.h
index f1e4d5f..faa5588 100644
--- a/optiboot/bootloaders/optiboot/pin_defs_x.h
+++ b/optiboot/bootloaders/optiboot/pin_defs_x.h
@@ -779,7 +779,7 @@
     defined(__AVR_ATtiny406__) || defined(__AVR_ATtiny3216__) ||	\
     defined(__AVR_ATtiny816__) || defined(__AVR_ATtiny416__) || \
     defined(__AVR_ATtiny1617__) || defined(__AVR_ATtiny3217__) || \
-    defined(__AVR_ATtiny1607__)
+    defined(__AVR_ATtiny1607__) || defined(__AVR_ATtiny817__)
 #define MYPMUX PORTMUX.CTRLB
 # if (UARTTX == B2)
 #  define UART_NAME "B2"