diff --git a/configs/sama5d4-ek/Kconfig b/configs/sama5d4-ek/Kconfig
index 27d3112a40..500b8f8255 100644
--- a/configs/sama5d4-ek/Kconfig
+++ b/configs/sama5d4-ek/Kconfig
@@ -5,6 +5,15 @@
 
 if ARCH_BOARD_SAMA5D4_EK
 
+choice
+	prompt "SAMA5D4-EK Board Version"
+	default SAMA5D4_MB_REVC
+
+config SAMA5D4_MB_REVC
+	bool "SAMA5D4-MB Rev. C"
+
+endchoice # SAMA5D4-EK Board Version
+
 choice
 	prompt "CPU Frequency"
 	default SAMA5D4EK_396MHZ
diff --git a/configs/sama5d4-ek/src/dram_main.c b/configs/sama5d4-ek/src/dram_main.c
index 6c7ccf03cb..667ae5388f 100644
--- a/configs/sama5d4-ek/src/dram_main.c
+++ b/configs/sama5d4-ek/src/dram_main.c
@@ -102,7 +102,7 @@ int dram_main(int argc, char *argv)
 
   /* Disable the PMC.  This is necessary on the SAMA5D4-MB Rev C. board.  On
    * that board, the PMIC can lock up the I2C bus.  The work around is
-   * difficult:
+   * awkward:
    *
    *   1. Open JP23 (disabling the WM8904 data line)
    *   2. Execute DRAMBOOT.  The PMIC will be disabled while JP23 is closed.
diff --git a/configs/sama5d4-ek/src/sama5d4-ek.h b/configs/sama5d4-ek/src/sama5d4-ek.h
index 56ac91f7ea..f974a393fe 100644
--- a/configs/sama5d4-ek/src/sama5d4-ek.h
+++ b/configs/sama5d4-ek/src/sama5d4-ek.h
@@ -372,10 +372,14 @@
 
 /* PMIC */
 
-#ifndef CONFIG_SAMA5_TWI0
+#if !defined(CONFIG_SAMA5_TWI0) || !defined(CONFIG_SAMA5D4_MB_REVC)
 #  undef HAVE_PMIC
 #endif
 
+#ifndef CONFIG_EXPERIMENTAL
+#  undef HAVE_PMIC /* REVISIT: Disable anyway because it does not yet work */
+#endif
+
 /* LEDs *****************************************************************************/
 /* There are 3 LEDs on the SAMA5D4-EK:
  *