diff --git a/ChangeLog b/ChangeLog
index 26e3621291..f1780c3234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3307,4 +3307,6 @@
 	  (Noted by Ronen Vainish).
 	* fs/mmap/fs_rammap.c:  Fix logic error and errno check (contributed
 	  by Kate).
+	* arch/avr/src: Fixes from AVR32 build errors that have crept in
+	  over the time; incorporated Kconfig for AVR3 (Richard Cochran).
 
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 7034ef8f40..b72a6c8a8d 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -40,8 +40,7 @@
 ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(CONFIG_ARCH_AVR32),y)
 ARCH_SUBDIR	= avr32
-endif
-ifeq ($(CONFIG_ARCH_AVR),y)
+else ifeq ($(CONFIG_ARCH_AVR),y)
 ARCH_SUBDIR	= avr
 endif
 
diff --git a/arch/avr/src/avr32/avr32_internal.h b/arch/avr/src/avr32/avr32_internal.h
index 56065edceb..332b0918e6 100644
--- a/arch/avr/src/avr32/avr32_internal.h
+++ b/arch/avr/src/avr32/avr32_internal.h
@@ -69,7 +69,7 @@
  * structure.  If is non-NULL only during interrupt processing.
  */
 
-extern volatile uint32_ *current_regs;
+extern volatile uint32_t *current_regs;
 
 /* This is the beginning of heap as provided from up_head.S. This is the first
  * address in DRAM after the loaded program+bss+idle stack.  The end of the
diff --git a/arch/avr/src/avr32/up_copystate.c b/arch/avr/src/avr32/up_copystate.c
index e3e4da0544..67640f8cce 100644
--- a/arch/avr/src/avr32/up_copystate.c
+++ b/arch/avr/src/avr32/up_copystate.c
@@ -41,6 +41,8 @@
 
 #include <stdint.h>
 
+#include <arch/avr32/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************