diff --git a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java
index bc5287a0ff..15ed3fab5c 100644
--- a/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java
+++ b/core/src/main/java/org/acegisecurity/context/SecurityContextHolder.java
@@ -35,13 +35,13 @@ import org.springframework.util.Assert;
  * @author Ben Alex
  * @version $Id$
  *
- * @see java.lang.InheritableThreadLocal
+ * @see java.lang.ThreadLocal
  * @see net.sf.acegisecurity.context.HttpSessionContextIntegrationFilter
  */
 public class SecurityContextHolder {
     //~ Static fields/initializers =============================================
 
-    private static InheritableThreadLocal contextHolder = new InheritableThreadLocal();
+    private static ThreadLocal contextHolder = new ThreadLocal();
 
     //~ Methods ================================================================
 
diff --git a/doc/docbook/acegi.xml b/doc/docbook/acegi.xml
index e6dddd8440..b5ffdfd7e1 100644
--- a/doc/docbook/acegi.xml
+++ b/doc/docbook/acegi.xml
@@ -366,9 +366,9 @@
         <literal>Authentication</literal>. All Acegi Security classes query
         the <literal>SecurityContextHolder</literal> for obtaining the current
         <literal>SecurityContext</literal> (and in turn the principal).
-        <literal>SecurityContextHolder</literal> is an
-        <literal>InheritableThreadLocal</literal>, meaning it is associated
-        with the current thread of execution.</para>
+        <literal>SecurityContextHolder</literal> is a
+        <literal>ThreadLocal</literal>, meaning it is associated with the
+        current thread of execution.</para>
       </sect2>
 
       <sect2 id="security-contexts-storage">