temp.diff

diff --git a/bootloaders/caterina/Caterina.h b/bootloaders/caterina/Caterina.h
index 5ce80fa..c273d50 100644
--- a/bootloaders/caterina/Caterina.h
+++ b/bootloaders/caterina/Caterina.h
@@ -65,10 +65,10 @@
 		#define SOFTWARE_IDENTIFIER          "CATERINA"
 		
 		#define CPU_PRESCALE(n)	(CLKPR = 0x80, CLKPR = (n))
-		#define LED_SETUP()		DDRC |= (1<<7); DDRB |= (1<<0); DDRD |= (1<<5);
-		#define L_LED_OFF()		PORTC &= ~(1<<7)
-		#define L_LED_ON()		PORTC |= (1<<7)
-		#define L_LED_TOGGLE()	PORTC ^= (1<<7)
+		#define LED_SETUP()		/* DDRC |= (1<<7); */ DDRB |= (1<<0); DDRD |= (1<<5);
+		#define L_LED_OFF()		/* PORTC &= ~(1<<7) */
+		#define L_LED_ON()		/* PORTC |= (1<<7) */
+		#define L_LED_TOGGLE()	/* PORTC ^= (1<<7) */
 		#if DEVICE_PID == 0x0037	// polarity of the RX and TX LEDs is reversed on the Micro
 			#define TX_LED_OFF()	PORTD &= ~(1<<5)
 			#define TX_LED_ON()		PORTD |= (1<<5)
diff --git a/bootloaders/caterina/Makefile b/bootloaders/caterina/Makefile
index b3bd9e8..da6d5fc 100644
--- a/bootloaders/caterina/Makefile
+++ b/bootloaders/caterina/Makefile
@@ -49,12 +49,12 @@
 # USB vendor ID (VID)
 # reuse of this VID by others is forbidden by USB-IF
 # official Arduino LLC VID
-# VID = 0x2341
+VID = 0x2341
 
 
 # USB product ID (PID)
 # official Leonardo PID
-# PID = 0x0036
+PID = 0x0036
 # official Micro PID
 # PID = 0x0037
 # official Esplora PID
@@ -127,7 +127,7 @@ OBJDIR = .
 
 
 # Path to the LUFA library
-LUFA_PATH = ../../../../../../LUFA/LUFA-111009
+LUFA_PATH = lufa
 
 
 # LUFA library compile-time options and predefined tokens
@@ -369,7 +369,7 @@ LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
 # Type: avrdude -c ?
 # to get a full listing.
 #
-AVRDUDE_PROGRAMMER = avrispmkII
+AVRDUDE_PROGRAMMER = usbtiny
 
 # com1 = serial port. Use lpt1 to connect to parallel port.
 AVRDUDE_PORT = usb
@@ -439,7 +439,7 @@ OBJDUMP = avr-objdump
 SIZE = avr-size
 AR = avr-ar rcs
 NM = avr-nm
-AVRDUDE = /Applications/avrdude -C /Applications/avrdude.conf -B 1
+AVRDUDE = avrdude
 REMOVE = rm -f
 REMOVEDIR = rm -rf
 COPY = cp