diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7fd647194..25504750b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -653,4 +653,8 @@
 	* apps/nshlib/Kconfig:  Default IP address should be 0x0a000001
 	  (10.0.0.1), not 0xa0000001 (160.0.0.1).  Ditto for the gateway
 	  (2013-9017).
+	* apps/examples/ostest/Kconfig:  Add configuration options for
+	  the FPU test.  There are still many OS test configuration
+	  optionst that do not appear in Kconfig (2013-9-18).
+
 
diff --git a/examples/ostest/Kconfig b/examples/ostest/Kconfig
index 0e0f2b016..1e6d4afab 100644
--- a/examples/ostest/Kconfig
+++ b/examples/ostest/Kconfig
@@ -59,4 +59,33 @@ config EXAMPLES_OSTEST_RR_RUNS
 		length of this test - it should last at least a few tens of seconds. Allowed
 		values [1; 32767], default 10
 
-endif
+if ARCH_FPU && SCHED_WAITPID && !DISABLE_SIGNALS
+
+config EXAMPLES_OSTEST_FPUTESTDISABLE
+	bool "Disable FPU test"
+	default n
+
+if !EXAMPLES_OSTEST_FPUTESTDISABLE
+
+config EXAMPLES_OSTEST_FPUSIZE
+	int "Size of floating point register save area"
+
+config EXAMPLES_OSTEST_FPULOOPS
+	int "Number of FPU test loops"
+	default 16
+
+config EXAMPLES_OSTEST_FPUMSDELAY
+	int "FPU test delay (MSec)"
+	default 750
+
+config EXAMPLES_OSTEST_FPUPRIORITY
+	int "FPU test thread priority"
+	default 100
+
+config EXAMPLES_OSTEST_FPUSTACKSIZE
+	int "FPU test thread stack size"
+	default 2048
+
+endif # !EXAMPLES_OSTEST_FPUTESTDISABLE
+endif # ARCH_FPU && SCHED_WAITPID && !DISABLE_SIGNALS
+endif # EXAMPLES_OSTEST