diff --git a/ChangeLog b/ChangeLog
index 47627eff53..fe7cf52a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6042,4 +6042,6 @@
 	  (2013-11-11).
 	* fs/procfs:  Add a little, primitive procfs file system. (2013-11-13).
 	* fs/binfs/README.txt:  Add a README file for binfs (2013-11-13).
+	* arch/arm/src/stm32/Kconfig:  Add missing setup of CAN TSEG1 and
+	  TSEG2 values.  From Martin Lederhilger (2013-11014).
 
diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index e563abfebd..8a236a99d0 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/arch/arm/src/stm32/Kconfig
@@ -3031,6 +3031,17 @@ config CAN2_BAUD
 	---help---
 		CAN2 BAUD rate.  Required if STM32_CAN2 is defined.
 
+config CAN_TSEG1
+	int "TSEG1 quanta"
+	default 6
+	---help---
+		The number of CAN time quanta in segment 1. Default: 6
+
+config CAN_TSEG2
+	int "TSEG2 quanta"
+	default 7
+	---help---
+		The number of CAN time quanta in segment 2. Default: 7
 endmenu
 
 if STM32_LTDC
diff --git a/configs/olimex-stm32-p207/nsh/defconfig b/configs/olimex-stm32-p207/nsh/defconfig
index b978631384..f3b4206619 100644
--- a/configs/olimex-stm32-p207/nsh/defconfig
+++ b/configs/olimex-stm32-p207/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -105,7 +105,9 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_SERIAL_TERMIOS is not set
 # CONFIG_CAN_EXTID is not set
 CONFIG_CAN1_BAUD=250000
-CONFIG_CAN_LOOPBACK=y
+CONFIG_CAN_TSEG1=6
+CONFIG_CAN_TSEG2=8
+# CONFIG_CAN_LOOPBACK is not set
 # CONFIG_NET_MULTICAST is not set
 # CONFIG_USBHOST_BULK_DISABLE is not set
 # CONFIG_USBHOST_INT_DISABLE is not set
@@ -704,7 +706,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME4="Button 4"
 CONFIG_EXAMPLES_BUTTONS_NAME5="Button 5"
 CONFIG_EXAMPLES_BUTTONS_NAME6="Button 6"
 CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
-CONFIG_EXAMPLES_CAN=y
+# CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CC3000BASIC is not set
 # CONFIG_EXAMPLES_COMPOSITE is not set
 # CONFIG_EXAMPLES_CXXTEST is not set