diff --git a/doc/ChangeLog b/doc/ChangeLog
index ebd2f2322f..bcc3a8966c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-22	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1782/cpukit
+	* porting/taskcontext.t: Disable deferred FPU context switches when SMP
+	is enabled. Per code tracking of deferred contexts is not
+	implemented.
+
 2011-04-07	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* rtems_footer.html.in, common/cpright.texi: Update dates in copyright.
diff --git a/doc/porting/taskcontext.t b/doc/porting/taskcontext.t
index eb19137c8f..dc52886e05 100644
--- a/doc/porting/taskcontext.t
+++ b/doc/porting/taskcontext.t
@@ -401,6 +401,9 @@ floating point context switches.
 #define CPU_USE_DEFERRED_FP_SWITCH       TRUE
 @end example
 
+Note that currently, when in SMP configuration, deferred floating point
+context switching is unavailable.
+
 @subsection Floating Point Context Data Structure
 
 The Context_Control_fp contains the per task information for the floating