diff --git a/ChangeLog b/ChangeLog
index 51378242fa..c6e19b7ac5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6487,4 +6487,6 @@
 	* include/ctype.h: Typo in macro name: iscntrol, not iscontrol (2104-1-17)
 	* libc/unistd/lib_getopt.c:  If there are no arguments (argc == 1), then
 	  getopt() make like the optind variable in an undefined state (2014-1-20).
+	* configs/olimex-stm32-p107:  Failes to build is SPI3 for UEXT is not
+	  remapped.  From Max Holtzberg (2014-1-21).
 
diff --git a/configs/olimex-stm32-p107/src/up_encx24j600.c b/configs/olimex-stm32-p107/src/up_encx24j600.c
index d8af313e33..bb0fd54ca5 100644
--- a/configs/olimex-stm32-p107/src/up_encx24j600.c
+++ b/configs/olimex-stm32-p107/src/up_encx24j600.c
@@ -79,6 +79,10 @@
 # error "Need CONFIG_STM32_SPI3 in the configuration"
 #endif
 
+#ifndef CONFIG_STM32_SPI3_REMAP
+# error "SPI should be remapped for UEXT use"
+#endif
+
 /* SPI Assumptions **********************************************************/
 
 #define ENCX24J600_SPI_PORTNO 3   /* On SPI1 */