diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 1704aad622..258501b766 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -39,6 +39,8 @@
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(CONFIG_ARCH_AVR32),y)
 ARCH_SUBDIR	= avr32
+ifeq ($(CONFIG_ARCH_AVR),y)
+ARCH_SUBDIR	= avr
 endif
 
 ifeq ($(WINTOOL),y)