diff --git a/configs/README.txt b/configs/README.txt
index 2092bab59a..c797e1c965 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -319,6 +319,11 @@ configs/mirtoo
   This is the port to the DTX1-4000L "Mirtoo" module.  This module uses MicroChip
   PIC32MX250F128D.  See http://www.dimitech.com/ for further information.
 
+configs/moteino-mega
+  This is placeholder for the LowPowerLab MoteinoMEGA that is based
+  on the Atmel AVR ATMega1284P MCU.  There is not much there yet and what is
+  there is untested due to tool-related issues.
+
 configs/mx1ads
   This is a port to the Motorola MX1ADS development board.  That board
   is based on the Freescale i.MX1 processor.  The i.MX1 is an ARM920T.
diff --git a/configs/moteino-mega/include/board.h b/configs/moteino-mega/include/board.h
index 2d73363b55..2fc1b38947 100644
--- a/configs/moteino-mega/include/board.h
+++ b/configs/moteino-mega/include/board.h
@@ -83,7 +83,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
diff --git a/configs/moteino-mega/src/moteino_mega_internal.h b/configs/moteino-mega/src/moteino_mega_internal.h
index 078242e33b..d697228385 100644
--- a/configs/moteino-mega/src/moteino_mega_internal.h
+++ b/configs/moteino-mega/src/moteino_mega_internal.h
@@ -63,7 +63,8 @@
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -77,7 +78,7 @@ extern "C" {
  ************************************************************************************/
 
 #if defined(CONFIG_AVR_SPI1) || defined(CONFIG_AVR_SPI2)
-EXTERN void weak_function atmega_spiinitialize(void);
+void weak_function atmega_spiinitialize(void);
 #endif
 
 /************************************************************************************
@@ -89,7 +90,7 @@ EXTERN void weak_function atmega_spiinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
-EXTERN void atmega_ledinit(void);
+void atmega_ledinit(void);
 #endif
 
 #undef EXTERN
diff --git a/configs/moteino-mega/src/up_boot.c b/configs/moteino-mega/src/up_boot.c
index 80233bb897..f845939f5a 100644
--- a/configs/moteino-mega/src/up_boot.c
+++ b/configs/moteino-mega/src/up_boot.c
@@ -50,7 +50,7 @@
 #include "moteino_mega_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -66,7 +66,7 @@
  *
  * Description:
  *   All ATMega architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
diff --git a/configs/moteino-mega/src/up_leds.c b/configs/moteino-mega/src/up_leds.c
index bc436aa5b4..68ffaa48af 100644
--- a/configs/moteino-mega/src/up_leds.c
+++ b/configs/moteino-mega/src/up_leds.c
@@ -52,7 +52,7 @@
 #ifdef CONFIG_ARCH_LEDS
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* CONFIG_DEBUG_LEDS enables debug output from this file (needs CONFIG_DEBUG