diff --git a/arch/arm/src/lpc11xx/lpc11_lowgetc.c b/arch/arm/src/lpc11xx/lpc11_lowgetc.c
index 1e04603640c..43c47fd904b 100644
--- a/arch/arm/src/lpc11xx/lpc11_lowgetc.c
+++ b/arch/arm/src/lpc11xx/lpc11_lowgetc.c
@@ -1,7 +1,7 @@
 /**************************************************************************
  * arch/arm/src/lpc11/lpc11_lowgetc.c
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/arch/arm/src/samdl/chip/saml_mclk.h b/arch/arm/src/samdl/chip/saml_mclk.h
index 31a7eb7a5c9..731cccc30bc 100644
--- a/arch/arm/src/samdl/chip/saml_mclk.h
+++ b/arch/arm/src/samdl/chip/saml_mclk.h
@@ -64,11 +64,11 @@
 #define SAM_MCLK_BUPDIV_OFFSET     0x0006  /* Backup clock division */
                                            /* 0x0007-0x000f: Reserved */
 #define SAM_MCLK_AHBMASK_OFFSET    0x0010  /* AHB mask */
-#define SAM_MCLK_APBAMASK_OFFSET   0x0010  /* APBA mask */
-#define SAM_MCLK_APBBMASK_OFFSET   0x0010  /* APBB mask */
-#define SAM_MCLK_APBCMASK_OFFSET   0x0010  /* APBC mask */
-#define SAM_MCLK_APBDMASK_OFFSET   0x0010  /* APBD mask */
-#define SAM_MCLK_APBEMASK_OFFSET   0x0010  /* APBE mask */
+#define SAM_MCLK_APBAMASK_OFFSET   0x0014  /* APBA mask */
+#define SAM_MCLK_APBBMASK_OFFSET   0x0018  /* APBB mask */
+#define SAM_MCLK_APBCMASK_OFFSET   0x001c  /* APBC mask */
+#define SAM_MCLK_APBDMASK_OFFSET   0x0020  /* APBD mask */
+#define SAM_MCLK_APBEMASK_OFFSET   0x0024  /* APBE mask */
 
 /* MCLK register addresses **********************************************************/
 
diff --git a/configs/saml21-xplained/include/board.h b/configs/saml21-xplained/include/board.h
index 7b3c104afd7..bbd336ffc88 100644
--- a/configs/saml21-xplained/include/board.h
+++ b/configs/saml21-xplained/include/board.h
@@ -156,7 +156,7 @@
 #define BOARD_OSC16M_ONDEMAND        1
 #undef  BOARD_OSC16M_RUNINSTANDBY
 
-#define BOARD_OSC16M_FREQUENCY       16000000 /* 16MHz high-accuracy internal oscillator */
+#define BOARD_OSC16M_FREQUENCY       4000000 /* 4MHz high-accuracy internal oscillator */
 
 /* OSCULP32K Configuration -- not used. */