diff --git a/LUFA/Drivers/USB/Core/USBMode.h b/LUFA/Drivers/USB/Core/USBMode.h
index f62c8c152fb967a352d4b017f7adab3ec82676a5..02c4ec321868b2085072ef1e4c330065cfbd750a 100644
--- a/LUFA/Drivers/USB/Core/USBMode.h
+++ b/LUFA/Drivers/USB/Core/USBMode.h
@@ -239,8 +239,12 @@
 				#define USB_CAN_BE_DEVICE
 			#endif
 
-			#if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
+			#if   ( defined(USB_CAN_BE_DEVICE) &&  defined(USB_CAN_BE_HOST))
 				#define USB_CAN_BE_BOTH
+			#elif ( defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
+				#define USB_DEVICE_ONLY
+			#elif (!defined(USB_CAN_BE_DEVICE) &&  defined(USB_CAN_BE_HOST))
+				#define USB_HOST_ONLY
 			#endif
 
 			#if defined(USB_HOST_ONLY)
diff --git a/LUFA/makefile b/LUFA/makefile
index 8129befdf811eee31dae02f6be0e60269a9bd80b..fe1cc4f728f136c27b1b6ac783a4e4db2d7b2c8a 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -13,6 +13,8 @@ LUFA_VERSION_NUM        = $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"'
 EXCLUDE_FROM_EXPORT     = Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.lss *.lst *.hex *.elf *.bin
 DOXYGEN_OVERRIDE_PARAMS = PROJECT_NUMBER=$(LUFA_VERSION_NUM)
 
+all:
+
 export_tar:
 	@echo Exporting LUFA library to a TAR archive...
 	@tar -cf LUFA_$(LUFA_VERSION_NUM).tar --directory=. $(EXCLUDE_FROM_EXPORT:%=--exclude=%) *
@@ -33,8 +35,6 @@ else
   LUFA_PATH           = .
   ARCH                = {AVR8,UC3,XMEGA}
   
-  all:
-
   clean:
 	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
 	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)